diff options
| author | David Cole <david.cole@kitware.com> | 2009-01-22 15:22:30 (GMT) |
|---|---|---|
| committer | David Cole <david.cole@kitware.com> | 2009-01-22 15:22:30 (GMT) |
| commit | e8a0e90133da84e552efc1852f9f1e589b250ed3 (patch) | |
| tree | 3fa09a5f8a8d9efacc2f4e7a84e9277be3ba281a /Tests/CMakeLists.txt | |
| parent | 0a23c0ee40939b50a41a2d80e98f6f307d84d26f (diff) | |
| download | CMake-e8a0e90133da84e552efc1852f9f1e589b250ed3.zip CMake-e8a0e90133da84e552efc1852f9f1e589b250ed3.tar.gz CMake-e8a0e90133da84e552efc1852f9f1e589b250ed3.tar.bz2 | |
BUG: Avoid trying to package the X11 test on Windows when there is no NSIS installer available.
Diffstat (limited to 'Tests/CMakeLists.txt')
| -rw-r--r-- | Tests/CMakeLists.txt | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 9e59660..43db525 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -372,6 +372,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=CVS -P ${CMake_SOURCE_DIR}/Utilities/Rel # option is ON: # set(CTEST_RUN_CPackComponents ${CTEST_TEST_CPACK}) + set(CTEST_package_X11_TEST ${CTEST_TEST_CPACK}) # But on Windows, only run the CPackComponents test if the NSIS # installer builder is available: @@ -385,6 +386,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=CVS -P ${CMake_SOURCE_DIR}/Utilities/Rel set(CTEST_RUN_CPackComponents ON) else(NSIS_MAKENSIS_EXECUTABLE) set(CTEST_RUN_CPackComponents OFF) + set(CTEST_package_X11_TEST OFF) endif(NSIS_MAKENSIS_EXECUTABLE) endif(WIN32) @@ -407,11 +409,11 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=CVS -P ${CMake_SOURCE_DIR}/Utilities/Rel LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/CPackComponents") ENDIF(CTEST_RUN_CPackComponents) - IF(CTEST_TEST_CPACK) + IF(CTEST_package_X11_TEST) SET(X11_build_target_arg --build-target package) - ELSE(CTEST_TEST_CPACK) + ELSE(CTEST_package_X11_TEST) SET(X11_build_target_arg) - ENDIF(CTEST_TEST_CPACK) + ENDIF(CTEST_package_X11_TEST) ADD_TEST(X11 ${CMAKE_CTEST_COMMAND} --build-and-test |