noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-13 19:49:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

🎉 Added Cpack for building installer for windows

Browse source
This commit is contained in:
Edgar 2021-02-16 11:38:37 +01:00 committed by Rasmus Karlsson
parent b21bcedef0
commit 38b51d69bf
4 changed files with 57 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CMakeLists.txt
View file

@ -1,9 +1,10 @@
cmake_minimum_required(VERSION 3.8) cmake_minimum_required(VERSION 3.8)
cmake_policy(SET CMP0087 NEW)
include(FeatureSummary) include(FeatureSummary)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_BINARY_DIR}) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_BINARY_DIR})
project(Chatterino2) project(Chatterino2 VERSION 2.2.3)
option(BUILD_APP "Build Chatterino2" ON) option(BUILD_APP "Build Chatterino2" ON)
option(BUILD_TESTS "Build the tests for Chatterino2" OFF) option(BUILD_TESTS "Build the tests for Chatterino2" OFF)
@ -18,6 +19,7 @@ SET(LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib/")
SET(ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib/") SET(ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib/")
SET(EXECUTABLE_OUTPUT_PATH ${RUNTIME_OUTPUT_DIRECTORY}) SET(EXECUTABLE_OUTPUT_PATH ${RUNTIME_OUTPUT_DIRECTORY})
SET(LIBRARY_OUTPUT_PATH ${RUNTIME_OUTPUT_DIRECTORY}) SET(LIBRARY_OUTPUT_PATH ${RUNTIME_OUTPUT_DIRECTORY})
SET(CHATTERINO2_VERSION ${PROJECT_VERSION})
if (WIN32) if (WIN32)
# fix executable paths for windows # fix executable paths for windows
@ -68,7 +70,7 @@ if (GIT_EXECUTABLE AND NOT GIT_REPOSITORY_NOT_FOUND)
else () else ()
set(GIT_HASH "GIT-REPOSITORY-NOT-FOUND") set(GIT_HASH "GIT-REPOSITORY-NOT-FOUND")
set(GIT_COMMIT "GIT-REPOSITORY-NOT-FOUND") set(GIT_COMMIT "GIT-REPOSITORY-NOT-FOUND")
set(GIT_RELEASE "GIT-REPOSITORY-NOT-FOUND") set(GIT_RELEASE "${PROJECT_VERSION}")
endif () endif ()
find_package(Qt5 REQUIRED COMPONENTS Core Widgets Gui Network Multimedia Svg Concurrent) find_package(Qt5 REQUIRED COMPONENTS Core Widgets Gui Network Multimedia Svg Concurrent)

2
cmake/pmm.cmake
View file

@ -27,7 +27,7 @@
## SOFTWARE. ## SOFTWARE.
# Bump this version to change what PMM version is downloaded # Bump this version to change what PMM version is downloaded
set(PMM_VERSION_INIT 1.9.5) set(PMM_VERSION_INIT 1.9.6)
# Helpful macro to set a variable if it isn't already set # Helpful macro to set a variable if it isn't already set
macro(_pmm_set_if_undef varname) macro(_pmm_set_if_undef varname)

BIN
resources/license.rtf Normal file
View file

Binary file not shown.

52
src/CMakeLists.txt
View file

@ -268,11 +268,59 @@ endif ()
target_precompile_headers(${PROJECT_NAME} PRIVATE PrecompiledHeader.hpp) target_precompile_headers(${PROJECT_NAME} PRIVATE PrecompiledHeader.hpp)
# ------------------------------------------------------------------------------------------------#
# Cpack
# ------------------------------------------------------------------------------------------------#
set(CPACK_PACKAGE_NAME "Chatterino")
set(CPACK_PACKAGE_DESCRIPTION "Chatterino 2")
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Chatterino is a chat client for twitch chat. It aims to be an improved/extended version of the twitch web chat")
set(CPACK_PACKAGE_VERSION ${CHATTERINO2_VERSION})
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/resources/license.rtf")
set(CPACK_PACKAGE_EXECUTABLES "chatterino" "Chatterino 2")
set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CHATTERINO2_VERSION}")
set(CPACK_GENERATOR ZIP)
if (MSVC) if (MSVC)
find_program(WINDEPLOYQT_PROGRAM windeployqt)
get_filename_component(QT_BIN_DIR ${WINDEPLOYQT_PROGRAM} DIRECTORY CACHE)
set(WINDEPLOYQT_COMAND ${WINDEPLOYQT_PROGRAM} $<TARGET_FILE:${PROJECT_NAME}> --release --no-compiler-runtime --no-translations --no-opengl-sw)
# Fix for windeployqt not being able to find qt5keychain
if (USE_PACKAGE_MANAGER AND EXISTS ${RUNTIME_OUTPUT_DIRECTORY}/qt5keychain.dll AND NOT EXISTS ${QT_BIN_DIR}/qt5keychain.dll)
message("Copying ${RUNTIME_OUTPUT_DIRECTORY}/qt5keychain.dll to ${QT_BIN_DIR}")
file(COPY ${RUNTIME_OUTPUT_DIRECTORY}/qt5keychain.dll DESTINATION ${QT_BIN_DIR})
endif ()
add_custom_target(copy_dll add_custom_target(copy_dll
COMMAND windeployqt $<TARGET_FILE:${PROJECT_NAME}> --release --no-compiler-runtime --no-translations --no-opengl-sw --dir ${RUNTIME_OUTPUT_DIRECTORY} COMMAND ${WINDEPLOYQT_COMAND}
WORKING_DIRECTORY ${RUNTIME_OUTPUT_DIRECTORY} WORKING_DIRECTORY ${RUNTIME_OUTPUT_DIRECTORY}
) )
install(TARGETS ${PROJECT_NAME}
RUNTIME DESTINATION .
)
install(CODE "execute_process(COMMAND ${WINDEPLOYQT_COMAND} --dir \${CMAKE_INSTALL_PREFIX})")
#For Windows Desktop shortcuts
set(CPACK_CREATE_DESKTOP_LINKS "chatterino" "Chatterino 2")
# Windows Add or Remove Program properties
set(CPACK_WIX_PROGRAM_MENU_FOLDER "Chatterino 2")
set(CPACK_WIX_PROPERTY_ARPCOMMENTS "${CPACK_PACKAGE_DESCRIPTION_SUMMARY}")
set(CPACK_WIX_PROPERTY_ARPURLINFOABOUT "https://chatterino.com/")
set(CPACK_WIX_PROPERTY_URLUPDATEINFO "https://chatterino.com/")
set(CPACK_WIX_PRODUCT_ICON "${CMAKE_SOURCE_DIR}/resources/icon.ico")
set(CPACK_WIX_LICENSE_RTF "${CPACK_RESOURCE_FILE_LICENSE}")
set(CPACK_WIX_UPGRADE_GUID "f33967d1-0bdd-4a4b-ba1a-d859bce8927a")
set(CPACK_PACKAGE_INSTALL_DIRECTORY "Chatterino2")
set(CPACK_GENERATOR ${CPACK_GENERATOR};WIX)
set(CPACK_MODULE_PATH "")
elseif (UNIX) elseif (UNIX)
install(TARGETS ${PROJECT_NAME} install(TARGETS ${PROJECT_NAME}
RUNTIME DESTINATION bin RUNTIME DESTINATION bin
@ -289,3 +337,5 @@ elseif (UNIX)
DESTINATION share/icons/hicolor/256x256/apps DESTINATION share/icons/hicolor/256x256/apps
) )
endif () endif ()
include(CPack)