removed windows cpack support and fixed unix config
This commit is contained in:
parent
c2b87d3d01
commit
2a14228b9d
|
@ -16,59 +16,29 @@
|
|||
# List of CPack variables:
|
||||
# http://www.vtk.org/Wiki/CMake:CPackConfiguration
|
||||
|
||||
if(WIN32)
|
||||
if (WIN32)
|
||||
message(FATAL_ERROR "CPack support for Windows has been removed.")
|
||||
endif()
|
||||
|
||||
install(TARGETS
|
||||
synergys
|
||||
synergyc
|
||||
synrgyhk
|
||||
COMPONENT core
|
||||
DESTINATION bin)
|
||||
install(TARGETS
|
||||
synergys
|
||||
synergyc
|
||||
COMPONENT core
|
||||
DESTINATION bin)
|
||||
|
||||
set(CPACK_COMPONENT_CORE_REQUIRED true)
|
||||
set(CPACK_COMPONENT_CORE_DISPLAY_NAME "Server and Client")
|
||||
|
||||
INSTALL(
|
||||
FILES
|
||||
bin/Release/qsynergy.exe
|
||||
${QT_DIR}/qt/bin/libgcc_s_dw2-1.dll
|
||||
${QT_DIR}/qt/bin/mingwm10.dll
|
||||
${QT_DIR}/qt/bin/QtGui4.dll
|
||||
${QT_DIR}/qt/bin/QtCore4.dll
|
||||
${QT_DIR}/qt/bin/QtNetwork4.dll
|
||||
COMPONENT gui
|
||||
DESTINATION bin)
|
||||
|
||||
set(CPACK_COMPONENT_GUI_DISPLAY_NAME "Graphical User Interface")
|
||||
|
||||
set(VCREDIST_PATH "${VCREDIST_DIR}/${VCREDIST_FILE}")
|
||||
|
||||
install(
|
||||
PROGRAMS
|
||||
${VCREDIST_PATH}
|
||||
COMPONENT vcredist
|
||||
DESTINATION redist)
|
||||
|
||||
set(CPACK_COMPONENT_VCREDIST_DISPLAY_NAME "Visual C++ Redistributable")
|
||||
|
||||
set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "
|
||||
ExecWait '\\\"$INSTDIR\\\\redist\\\\${VCREDIST_FILE}\\\" /install /q'")
|
||||
|
||||
else()
|
||||
|
||||
IF(APPLE)
|
||||
if (UNIX)
|
||||
if (APPLE)
|
||||
# TODO: how the hell do we distribute mac apps?
|
||||
#INSTALL(
|
||||
#install(
|
||||
# MACOSX_BUNDLE
|
||||
# bin/QSynergy.app
|
||||
# DESTINATION bin)
|
||||
ELSE(APPLE)
|
||||
INSTALL(
|
||||
else()
|
||||
install(
|
||||
FILES
|
||||
bin/qsynergy
|
||||
DESTINATION bin)
|
||||
ENDIF(APPLE)
|
||||
|
||||
endif()
|
||||
endif()
|
||||
|
||||
# The default CPack behaviour is not to append the system processor
|
||||
|
@ -76,22 +46,6 @@ endif()
|
|||
# both 32-bit and 64-bit processors.
|
||||
SET(CPACK_SYSTEM_NAME ${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR})
|
||||
|
||||
# Hack: When running CMake on 64-bit Windows 7, the value of
|
||||
# CMAKE_SYSTEM_PROCESSOR always seems to be x86, regardless of if the
|
||||
# CMake build is 32-bit or 64-bit. As a work around, we will prefix either
|
||||
# x86 or x64 (in the same style as Microsoft do with their installers).
|
||||
# However, some confusion may be caused when the user sees that Synergy
|
||||
# is installed in the x86 Program Files directory (even though it's a
|
||||
# 64-bit build). This is caused by NSIS only supporting the 32-bit
|
||||
# installs structure (also uses 32-bit registry key locations).
|
||||
IF(WIN32)
|
||||
IF(CMAKE_CL_64)
|
||||
SET(CPACK_SYSTEM_NAME Windows-x64)
|
||||
ELSE(CMAKE_CL_64)
|
||||
SET(CPACK_SYSTEM_NAME Windows-x86)
|
||||
ENDIF(CMAKE_CL_64)
|
||||
ENDIF(WIN32)
|
||||
|
||||
# For source code, use .tar.gz on Unix, and .zip on Windows
|
||||
IF(UNIX)
|
||||
SET(CPACK_SOURCE_GENERATOR TGZ)
|
||||
|
@ -114,18 +68,6 @@ SET(CPACK_PACKAGE_CONTACT http://synergy-foss.org/)
|
|||
SET(CPACK_RESOURCE_FILE_LICENSE "${cmake_dir}/License.rtf")
|
||||
SET(CPACK_RESOURCE_FILE_README "${cmake_dir}/Readme.txt")
|
||||
|
||||
IF(WIN32)
|
||||
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_UNIICON ${WIN32_ICON})
|
||||
SET(CPACK_NSIS_INSTALLED_ICON_NAME "bin/qsynergy.exe")
|
||||
SET(CPACK_PACKAGE_INSTALL_DIRECTORY "Synergy")
|
||||
set(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "Synergy")
|
||||
SET(CPACK_PACKAGE_EXECUTABLES qsynergy;Synergy)
|
||||
ENDIF(WIN32)
|
||||
|
||||
# files to exclude from src package (regex patterns)
|
||||
# to escape, use 4 backslashes (\\\\) -- yuck!
|
||||
SET(CPACK_SOURCE_IGNORE_FILES
|
||||
|
|
Loading…
Reference in New Issue