Mirrors/ScreenPlay
Mirrors/ScreenPlay
1
0
Fork 0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-11-25 04:02:50 +01:00
Code Issues Projects Releases Activity

Fix linux installer creation

Browse Source
This commit is contained in:
Elias Steurer 2022-01-27 18:18:49 +01:00
parent 0adc9c8002
commit b24986b1ba
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
CMake/CreateIFWInstaller.cmake
View File

@ -1,9 +1,9 @@
# Variable must be around "" to be equal!
if(${SCREENPLAY_IFW_ROOT} STREQUAL "") if("${CPACK_IFW_ROOT}" STREQUAL "")
# Hardcoded Qt paths that are used by the QtMaintanance tool for now... # Hardcoded Qt paths that are used by the QtMaintanance tool for now...
if(WIN32) if(WIN32)
set(SCREENPLAY_IFW_ROOT "C:/Qt/Tools/QtInstallerFramework/4.2") set(SCREENPLAY_IFW_ROOT "C:/Qt/Tools/QtInstallerFramework/4.2")
elseif(UNIX AND NOT APPLE) elseif(UNIX)
set(SCREENPLAY_IFW_ROOT "$ENV{HOME}/Qt/Tools/QtInstallerFramework/4.2") set(SCREENPLAY_IFW_ROOT "$ENV{HOME}/Qt/Tools/QtInstallerFramework/4.2")
endif() endif()
message(STATUS "[CPACK_IFW_ROOT] Not set. Using hardcoded value: ${SCREENPLAY_IFW_ROOT}") message(STATUS "[CPACK_IFW_ROOT] Not set. Using hardcoded value: ${SCREENPLAY_IFW_ROOT}")
@ -29,9 +29,9 @@ set(CPACK_GENERATOR "IFW")
set(CPACK_IFW_PACKAGE_NAME "ScreenPlay") set(CPACK_IFW_PACKAGE_NAME "ScreenPlay")
set(CPACK_IFW_ROOT ${SCREENPLAY_IFW_ROOT}) set(CPACK_IFW_ROOT ${SCREENPLAY_IFW_ROOT})
set(CPACK_IFW_TARGET_DIRECTORY "@HomeDir@/Apps/ScreenPlay") set(CPACK_IFW_TARGET_DIRECTORY "@HomeDir@/Apps/ScreenPlay")
set(CPACK_IFW_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/ScreenPlay/assets/icons/app.ico") set(CPACK_IFW_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/ScreenPlay/assets/icons/app.ico")
set(CPACK_IFW_PACKAGE_WINDOW_ICON "${CMAKE_CURRENT_SOURCE_DIR}/ScreenPlay/assets/icons/app.ico") set(CPACK_IFW_PACKAGE_WINDOW_ICON "${CMAKE_SOURCE_DIR}/ScreenPlay/assets/icons/app.ico")
set(CPACK_IFW_PACKAGE_CONTROL_SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/Tools/Installer/installscript.qs") set(CPACK_IFW_PACKAGE_CONTROL_SCRIPT "${CMAKE_SOURCE_DIR}/Tools/Installer/installscript.qs")
set(CPACK_IFW_PACKAGE_GROUP ScreenPlay) set(CPACK_IFW_PACKAGE_GROUP ScreenPlay)
set(CPACK_IFW_VERBOSE ON) set(CPACK_IFW_VERBOSE ON)
@ -51,7 +51,7 @@ include(CPackIFW)
install( install(
DIRECTORY "${CMAKE_BINARY_DIR}/bin/" DIRECTORY "${CMAKE_BINARY_DIR}/bin/"
COMPONENT ScreenPlay COMPONENT ScreenPlay
DESTINATION "/") DESTINATION "./")
cpack_add_component( cpack_add_component(
ScreenPlay ScreenPlay
@ -62,7 +62,5 @@ cpack_ifw_configure_component(
ScreenPlayApp FORCED_INSTALLATION ScreenPlayApp FORCED_INSTALLATION
NAME "ScreenPlay" NAME "ScreenPlay"
VERSION ${PROJECT_VERSION} # Version of component VERSION ${PROJECT_VERSION} # Version of component
DESCRIPTION "Welcome to the K3000 installer." DESCRIPTION "Welcome to the ScreenPlay installer."
# Gets ignored and I do not know why
SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/Tools/Installer/installscript.qs"
CHECKABLE FALSE) CHECKABLE FALSE)

2
CMakeLists.txt
View File

@ -12,7 +12,7 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
option(SCREENPLAY_IFW_ROOT "" STRING ) set(SCREENPLAY_IFW_ROOT "")
option(SCREENPLAY_STEAM "For FOSS distribution so we do not bundle proprietary code." ON) option(SCREENPLAY_STEAM "For FOSS distribution so we do not bundle proprietary code." ON)
option(SCREENPLAY_TESTS "Enables UI tests." OFF) option(SCREENPLAY_TESTS "Enables UI tests." OFF)
option(SCREENPLAY_CREATE_INSTALLER "Indicates whether an installer via the Qt Installer Framework is created." OFF) option(SCREENPLAY_CREATE_INSTALLER "Indicates whether an installer via the Qt Installer Framework is created." OFF)