diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2008-02-09 14:53:52 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2008-02-09 14:53:52 (GMT) |
| commit | f6014938cbb4a914ed5b549261a0c06215593c30 (patch) | |
| tree | ddcf95907670ac1fe393f19f05a06218458a0f03 /CMakeCPackOptions.cmake.in | |
| parent | 445f47473c205d9d310a6a51c14fa7ac98c2cad0 (diff) | |
| download | CMake-f6014938cbb4a914ed5b549261a0c06215593c30.zip CMake-f6014938cbb4a914ed5b549261a0c06215593c30.tar.gz CMake-f6014938cbb4a914ed5b549261a0c06215593c30.tar.bz2 | |
ENH: make it so cmake-gui only installs if qt is static on windows
Diffstat (limited to 'CMakeCPackOptions.cmake.in')
| -rw-r--r-- | CMakeCPackOptions.cmake.in | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/CMakeCPackOptions.cmake.in b/CMakeCPackOptions.cmake.in index 0c1eac4..d3b35e8 100644 --- a/CMakeCPackOptions.cmake.in +++ b/CMakeCPackOptions.cmake.in @@ -3,8 +3,7 @@ # in this file. if(CPACK_GENERATOR MATCHES "NSIS") - SET(BUILD_QtDialog @BUILD_QtDialog@) - SET(CMAKE_QT_IS_STATIC @CMAKE_QT_IS_STATIC@) + SET(QT_DIALOG_OPTIONS_FILE @QT_DIALOG_OPTIONS_FILE@) # set the install/unistall icon used for the installer itself # There is a bug in NSI that does not handle full unix paths properly. SET(CPACK_NSIS_MUI_ICON "@CMake_SOURCE_DIR@/Utilities/Release\\CMakeLogo.ico") @@ -33,11 +32,9 @@ if(CPACK_GENERATOR MATCHES "NSIS") SET(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\www.kitware.com") SET(CPACK_NSIS_CONTACT @CPACK_PACKAGE_CONTACT@) SET(CPACK_NSIS_MODIFY_PATH ON) - # only package cmake-gui if QT is static on windows - IF(BUILD_QtDialog AND CMAKE_QT_IS_STATIC) - SET(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} "cmake-gui" "cmake-gui(beta)") - ENDIF(BUILD_QtDialog AND CMAKE_QT_IS_STATIC) endif(CPACK_GENERATOR MATCHES "NSIS") +# include the cpack options +INCLUDE("@QT_DIALOG_CPACK_OPTIONS_FILE@") if(CPACK_GENERATOR MATCHES "CygwinSource") # when packaging source make sure the .build directory is not included |