diff options
| author | Andy Cedilnik <andy.cedilnik@kitware.com> | 2006-10-12 17:05:50 (GMT) |
|---|---|---|
| committer | Andy Cedilnik <andy.cedilnik@kitware.com> | 2006-10-12 17:05:50 (GMT) |
| commit | e31dc3abe554cdae307d654df9a245d8e72f55d4 (patch) | |
| tree | 26e7b683763cc56765f0404c15bbb7458d8bdfae /Tests | |
| parent | 77a42276525e6ce89945af73b97d5a1d5886ad1b (diff) | |
| download | CMake-e31dc3abe554cdae307d654df9a245d8e72f55d4.zip CMake-e31dc3abe554cdae307d654df9a245d8e72f55d4.tar.gz CMake-e31dc3abe554cdae307d654df9a245d8e72f55d4.tar.bz2 | |
ENH: Several CPack fixes. First, allow user to set CMAKE_MODULE_PATH for CPack; make SetOptionIfNotSet more robust to handle empty options; do test TGZ, STGZ, and TZ, Add handling (and test) of Install Script; set environment variable CMAKE_INSTALL_PREFIX
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/SimpleInstall/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | Tests/SimpleInstallS2/CMakeLists.txt | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Tests/SimpleInstall/CMakeLists.txt b/Tests/SimpleInstall/CMakeLists.txt index 3d8cdb8..a762915 100644 --- a/Tests/SimpleInstall/CMakeLists.txt +++ b/Tests/SimpleInstall/CMakeLists.txt @@ -218,6 +218,7 @@ ENDIF(CMAKE_CONFIGURATION_TYPES) # Dummy test of CPack SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Test of packaging with cpack") SET(CPACK_PACKAGE_VENDOR "Kitware") +SET(CPACK_INSTALL_SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/PackageScript.cmake") IF(WIN32 AND NOT UNIX) FIND_PROGRAM(NSIS_MAKENSIS NAMES makensis @@ -229,7 +230,7 @@ IF(WIN32 AND NOT UNIX) ENDIF(NOT NSIS_MAKENSIS) ENDIF(WIN32 AND NOT UNIX) IF(UNIX AND NOT APPLE) - # SET(CPACK_GENERATOR "TGZ;STGZ") + SET(CPACK_GENERATOR "TGZ;STGZ;TZ") # FIND_PROGRAM(found_compress # NAMES compress) # IF(found_compress) diff --git a/Tests/SimpleInstallS2/CMakeLists.txt b/Tests/SimpleInstallS2/CMakeLists.txt index 3d8cdb8..a762915 100644 --- a/Tests/SimpleInstallS2/CMakeLists.txt +++ b/Tests/SimpleInstallS2/CMakeLists.txt @@ -218,6 +218,7 @@ ENDIF(CMAKE_CONFIGURATION_TYPES) # Dummy test of CPack SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Test of packaging with cpack") SET(CPACK_PACKAGE_VENDOR "Kitware") +SET(CPACK_INSTALL_SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/PackageScript.cmake") IF(WIN32 AND NOT UNIX) FIND_PROGRAM(NSIS_MAKENSIS NAMES makensis @@ -229,7 +230,7 @@ IF(WIN32 AND NOT UNIX) ENDIF(NOT NSIS_MAKENSIS) ENDIF(WIN32 AND NOT UNIX) IF(UNIX AND NOT APPLE) - # SET(CPACK_GENERATOR "TGZ;STGZ") + SET(CPACK_GENERATOR "TGZ;STGZ;TZ") # FIND_PROGRAM(found_compress # NAMES compress) # IF(found_compress) |