diff options
| author | Andy Cedilnik <andy.cedilnik@kitware.com> | 2006-02-28 18:30:11 (GMT) |
|---|---|---|
| committer | Andy Cedilnik <andy.cedilnik@kitware.com> | 2006-02-28 18:30:11 (GMT) |
| commit | 3341923ecb02a21e8182a59a82bb016c9b992c92 (patch) | |
| tree | 061dc902d8f849bc1e3963f581c1227974eca023 /Tests | |
| parent | b1443931b09d26cde75bd5cff613a3a39c6255e5 (diff) | |
| download | CMake-3341923ecb02a21e8182a59a82bb016c9b992c92.zip CMake-3341923ecb02a21e8182a59a82bb016c9b992c92.tar.gz CMake-3341923ecb02a21e8182a59a82bb016c9b992c92.tar.bz2 | |
ENH: Attempt to handle windows without NSIS installed
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/SimpleInstall/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | Tests/SimpleInstallS2/CMakeLists.txt | 10 |
2 files changed, 20 insertions, 0 deletions
diff --git a/Tests/SimpleInstall/CMakeLists.txt b/Tests/SimpleInstall/CMakeLists.txt index b4787c8..a228a15 100644 --- a/Tests/SimpleInstall/CMakeLists.txt +++ b/Tests/SimpleInstall/CMakeLists.txt @@ -125,6 +125,16 @@ SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Test of packaging with cpack") SET(CPACK_PACKAGE_VENDOR "Kitware") SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/foo.h") +IF(WIN32 AND NOT UNIX) + FIND_PROGRAM(NSIS_MAKENSIS NAMES makensis + PATHS [HKEY_LOCAL_MACHINE\\SOFTWARE\\NSIS] + DOC "Where is makensis.exe located" + ) + IF(NOT NSIS_MAKENSIS) + SET(CPACK_GENERATOR TGZ) + ENDIF(NOT NSIS_MAKENSIS) +ENDIF(WIN32 AND NOT UNIX) + SET(CPACK_PACKAGE_EXECUTABLES "SimpleInstall" "Simple Install") INCLUDE(CPack) diff --git a/Tests/SimpleInstallS2/CMakeLists.txt b/Tests/SimpleInstallS2/CMakeLists.txt index b4787c8..a228a15 100644 --- a/Tests/SimpleInstallS2/CMakeLists.txt +++ b/Tests/SimpleInstallS2/CMakeLists.txt @@ -125,6 +125,16 @@ SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Test of packaging with cpack") SET(CPACK_PACKAGE_VENDOR "Kitware") SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/foo.h") +IF(WIN32 AND NOT UNIX) + FIND_PROGRAM(NSIS_MAKENSIS NAMES makensis + PATHS [HKEY_LOCAL_MACHINE\\SOFTWARE\\NSIS] + DOC "Where is makensis.exe located" + ) + IF(NOT NSIS_MAKENSIS) + SET(CPACK_GENERATOR TGZ) + ENDIF(NOT NSIS_MAKENSIS) +ENDIF(WIN32 AND NOT UNIX) + SET(CPACK_PACKAGE_EXECUTABLES "SimpleInstall" "Simple Install") INCLUDE(CPack) |