diff options
| author | David Cole <david.cole@kitware.com> | 2009-11-16 20:35:04 (GMT) |
|---|---|---|
| committer | David Cole <david.cole@kitware.com> | 2009-11-16 20:35:04 (GMT) |
| commit | 1412cc442e29f2a7b5c19387cf38aa2e54a8c11d (patch) | |
| tree | c2f74939357fa89eb114f0074ca1594d58a3a143 | |
| parent | 69fdf711fec78ccec28996fd0c0c807adcabf178 (diff) | |
| download | CMake-1412cc442e29f2a7b5c19387cf38aa2e54a8c11d.zip CMake-1412cc442e29f2a7b5c19387cf38aa2e54a8c11d.tar.gz CMake-1412cc442e29f2a7b5c19387cf38aa2e54a8c11d.tar.bz2 | |
SimpleInstall test now builds an installer package if CTEST_TEST_CPACK is ON at the Tests/CMakeLists.txt level.
| -rw-r--r-- | Tests/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | Tests/SimpleInstall/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | Tests/SimpleInstallS2/CMakeLists.txt | 9 |
3 files changed, 17 insertions, 2 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 400cfdd..2e5a783 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -405,6 +405,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=CVS -P ${CMake_SOURCE_DIR}/Utilities/Rel --build-two-config --build-options "-DCMAKE_INSTALL_PREFIX:PATH=${SimpleInstallInstallDir}" + "-DCTEST_TEST_CPACK:BOOL=${CTEST_TEST_CPACK}" --test-command ${SimpleInstallInstallDir}/MyTest/bin/SimpleInstExe) LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/SimpleInstall") ADD_TEST(SimpleInstall-Stage2 ${CMAKE_CTEST_COMMAND} diff --git a/Tests/SimpleInstall/CMakeLists.txt b/Tests/SimpleInstall/CMakeLists.txt index 7a249d8..5fc6550 100644 --- a/Tests/SimpleInstall/CMakeLists.txt +++ b/Tests/SimpleInstall/CMakeLists.txt @@ -364,14 +364,21 @@ SET(CPACK_PACKAGE_EXECUTABLES "SimpleInstall" "Simple Install") SET(CMAKE_INSTALL_MFC_LIBRARIES 1) SET(CMAKE_INSTALL_DEBUG_LIBRARIES 1) INCLUDE(InstallRequiredSystemLibraries) -INCLUDE(CPack) IF(CTEST_TEST_CPACK) SET(PACKAGE_TARGET --build-target package) + + # Avoid settings that require the .zip file command line tools... + # (just build an NSIS installer without component support) + # + SET(CPACK_BINARY_ZIP OFF) + SET(CPACK_MONOLITHIC_INSTALL ON) ELSE(CTEST_TEST_CPACK) SET(PACKAGE_TARGET) ENDIF(CTEST_TEST_CPACK) +INCLUDE(CPack) + ADD_CUSTOM_COMMAND( TARGET ${install_target} POST_BUILD diff --git a/Tests/SimpleInstallS2/CMakeLists.txt b/Tests/SimpleInstallS2/CMakeLists.txt index 7a249d8..5fc6550 100644 --- a/Tests/SimpleInstallS2/CMakeLists.txt +++ b/Tests/SimpleInstallS2/CMakeLists.txt @@ -364,14 +364,21 @@ SET(CPACK_PACKAGE_EXECUTABLES "SimpleInstall" "Simple Install") SET(CMAKE_INSTALL_MFC_LIBRARIES 1) SET(CMAKE_INSTALL_DEBUG_LIBRARIES 1) INCLUDE(InstallRequiredSystemLibraries) -INCLUDE(CPack) IF(CTEST_TEST_CPACK) SET(PACKAGE_TARGET --build-target package) + + # Avoid settings that require the .zip file command line tools... + # (just build an NSIS installer without component support) + # + SET(CPACK_BINARY_ZIP OFF) + SET(CPACK_MONOLITHIC_INSTALL ON) ELSE(CTEST_TEST_CPACK) SET(PACKAGE_TARGET) ENDIF(CTEST_TEST_CPACK) +INCLUDE(CPack) + ADD_CUSTOM_COMMAND( TARGET ${install_target} POST_BUILD |