chris/js8call
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated CPack for installation locations

Browse Source
This commit is contained in:
Jordan Sherer 2018-09-09 21:57:44 -04:00
parent 4b28f9eca5
commit 0b49dc0398
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CMakeCPackOptions.cmake.in
View File

@ -24,7 +24,17 @@ if (CPACK_GENERATOR MATCHES "NSIS")
set (CPACK_SET_DESTDIR FALSE) set (CPACK_SET_DESTDIR FALSE)
set (CPACK_STRIP_FILES FALSE) # breaks Qt packaging on Windows set (CPACK_STRIP_FILES FALSE) # breaks Qt packaging on Windows
set (CPACK_NSIS_INSTALL_ROOT "C:\\FT8Call") # set (CPACK_NSIS_INSTALL_ROOT "C:\\FT8Call")
if(CMAKE_CL_64)
set(CPACK_NSIS_INSTALL_ROOT "$PROGRAMFILES64")
set(CPACK_NSIS_PACKAGE_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY} (Win64)")
set(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "${CPACK_PACKAGE_NAME} ${CPACK_PACKAGE_VERSION} (Win64)")
else()
set(CPACK_NSIS_INSTALL_ROOT "$PROGRAMFILES")
set(CPACK_NSIS_PACKAGE_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY}")
set(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "${CPACK_PACKAGE_NAME} ${CPACK_PACKAGE_VERSION}")
endif()
# set the install/unistall icon used for the installer itself # set the install/unistall icon used for the installer itself
# There is a bug in NSI that does not handle full unix paths properly. # There is a bug in NSI that does not handle full unix paths properly.

17
CMakeLists.txt
View File

@ -1401,6 +1401,7 @@ if (UNIX)
endif (NOT APPLE) endif (NOT APPLE)
endif (UNIX) endif (UNIX)
# #
# installation # installation
# #
@ -1481,7 +1482,6 @@ if (APPLE)
) )
endif (APPLE) endif (APPLE)
# #
# uninstall support # uninstall support
# #
@ -1519,18 +1519,25 @@ configure_file (
if (NOT WIN32 AND NOT APPLE) if (NOT WIN32 AND NOT APPLE)
# install a desktop file so wsjtx appears in the application start # install a desktop file so ft8call appears in the application start
# menu with an icon # menu with an icon
install ( install (
FILES ft8call.desktop message_aggregator.desktop FILES ft8call.desktop
DESTINATION share/applications DESTINATION /usr/share/applications
#COMPONENT runtime #COMPONENT runtime
) )
install ( install (
FILES icons/Unix/wsjtx_icon.png FILES icons/Unix/wsjtx_icon.png
DESTINATION share/pixmaps DESTINATION /usr/share/pixmaps
#COMPONENT runtime #COMPONENT runtime
) )
execute_process(COMMAND ln -s /opt/ft8call/bin/ft8call lft8call)
install(FILES
${CMAKE_BINARY_DIR}/lft8call DESTINATION /usr/bin/ RENAME ft8call
#COMPONENT runtime
)
endif (NOT WIN32 AND NOT APPLE) endif (NOT WIN32 AND NOT APPLE)