rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

improved installers somewhat, but we still need to manually implement nsis

This commit is contained in:
Nick Bolton 2011-01-19 03:27:40 +00:00
parent 2e15caa2bb
commit 530e611b38
1 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
cmake/CMakeLists_cpack.txt
View File

@ -16,19 +16,18 @@
# List of CPack variables: # List of CPack variables:
# http://www.vtk.org/Wiki/CMake:CPackConfiguration # http://www.vtk.org/Wiki/CMake:CPackConfiguration
# CPack files common to all platforms. if(WIN32)
SET(cpack_targets synergys synergyc)
IF(WIN32) install(TARGETS
# Windows has an extra GUI and DLL. synergys
LIST(APPEND cpack_targets launcher synrgyhk) synergyc
ENDIF(WIN32) synrgyhk
COMPONENT core
DESTINATION bin)
INSTALL( set(CPACK_COMPONENT_CORE_REQUIRED true)
TARGETS ${cpack_targets} set(CPACK_COMPONENT_CORE_DISPLAY_NAME "Server and Client")
RUNTIME DESTINATION bin)
IF(WIN32)
INSTALL( INSTALL(
FILES FILES
bin/Release/qsynergy.exe bin/Release/qsynergy.exe
@ -37,10 +36,10 @@ IF(WIN32)
${QT_DIR}/qt/bin/QtGui4.dll ${QT_DIR}/qt/bin/QtGui4.dll
${QT_DIR}/qt/bin/QtCore4.dll ${QT_DIR}/qt/bin/QtCore4.dll
${QT_DIR}/qt/bin/QtNetwork4.dll ${QT_DIR}/qt/bin/QtNetwork4.dll
COMPONENT qsynergy COMPONENT gui
DESTINATION bin) DESTINATION bin)
set(CPACK_COMPONENT_QSYNERGY_DISPLAY_NAME "Graphical User Interface") set(CPACK_COMPONENT_GUI_DISPLAY_NAME "Graphical User Interface")
set(VCREDIST_PATH "${VCREDIST_DIR}/${VCREDIST_FILE}") set(VCREDIST_PATH "${VCREDIST_DIR}/${VCREDIST_FILE}")
@ -50,12 +49,13 @@ IF(WIN32)
COMPONENT vcredist COMPONENT vcredist
DESTINATION redist) DESTINATION redist)
set(CPACK_COMPONENT_VCREDIST_DISPLAY_NAME "Visual C++ 2008 Redistributable") set(CPACK_COMPONENT_VCREDIST_DISPLAY_NAME "Visual C++ Redistributable")
set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS " set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "
ExecWait '\\\"$INSTDIR\\\\redist\\\\${VCREDIST_FILE}\\\" /install /q'") ExecWait '\\\"$INSTDIR\\\\redist\\\\${VCREDIST_FILE}\\\" /install /q'")
ELSE(WIN32) else()
IF(APPLE) IF(APPLE)
# TODO: how the hell do we distribute mac apps? # TODO: how the hell do we distribute mac apps?
#INSTALL( #INSTALL(
@ -68,7 +68,8 @@ ELSE(WIN32)
bin/qsynergy bin/qsynergy
DESTINATION bin) DESTINATION bin)
ENDIF(APPLE) ENDIF(APPLE)
ENDIF(WIN32)
endif()
# The default CPack behaviour is not to append the system processor # The default CPack behaviour is not to append the system processor
# type, which is undesirable in our case, since we want to support # type, which is undesirable in our case, since we want to support
@ -114,11 +115,14 @@ SET(CPACK_RESOURCE_FILE_LICENSE "${cmake_dir}/License.rtf")
SET(CPACK_RESOURCE_FILE_README "${cmake_dir}/Readme.txt") SET(CPACK_RESOURCE_FILE_README "${cmake_dir}/Readme.txt")
IF(WIN32) IF(WIN32)
SET(WIN32_ICON "${root_dir}/cmd/launcher/synergy.ico") SET(WIN32_ICON "${root_dir}/gui/res/win/QSynergy.ico")
set(CPACK_NSIS_URL_INFO_ABOUT "http://synergy-foss.org")
set(CPACK_NSIS_HELP_LINK "http://synergy-foss.org/support")
SET(CPACK_NSIS_MUI_ICON ${WIN32_ICON}) SET(CPACK_NSIS_MUI_ICON ${WIN32_ICON})
SET(CPACK_NSIS_MUI_UNIICON ${WIN32_ICON}) SET(CPACK_NSIS_MUI_UNIICON ${WIN32_ICON})
SET(CPACK_NSIS_INSTALLED_ICON_NAME launcher) SET(CPACK_NSIS_INSTALLED_ICON_NAME "bin/qsynergy.exe")
SET(CPACK_PACKAGE_INSTALL_DIRECTORY "Synergy") SET(CPACK_PACKAGE_INSTALL_DIRECTORY "Synergy")
set(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "Synergy")
SET(CPACK_PACKAGE_EXECUTABLES qsynergy;Synergy) SET(CPACK_PACKAGE_EXECUTABLES qsynergy;Synergy)
ENDIF(WIN32) ENDIF(WIN32)