diff options
| author | David Cole <david.cole@kitware.com> | 2009-01-21 16:54:30 (GMT) |
|---|---|---|
| committer | David Cole <david.cole@kitware.com> | 2009-01-21 16:54:30 (GMT) |
| commit | c647ed54d9c071393e95b204aac2bb975ec95fe9 (patch) | |
| tree | de2b8f9c339804962fdf912d9837410cec5e3e60 /Tests/CMakeLists.txt | |
| parent | d2f27558dfe6ab7c3a36b631249c9e3b89e9eb28 (diff) | |
| download | CMake-c647ed54d9c071393e95b204aac2bb975ec95fe9.zip CMake-c647ed54d9c071393e95b204aac2bb975ec95fe9.tar.gz CMake-c647ed54d9c071393e95b204aac2bb975ec95fe9.tar.bz2 | |
BUG: Fix issue #7833: Add file extension handling to CPack generated installers for OSXX11 applications. Also modify the X11 test to build such an installer on Mac builds that test CPack and have X11 available. Thanks to Wes Turner for the patch.
Diffstat (limited to 'Tests/CMakeLists.txt')
| -rw-r--r-- | Tests/CMakeLists.txt | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index ca87201..9e59660 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -407,7 +407,13 @@ ${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) - ADD_TEST(X11 ${CMAKE_CTEST_COMMAND} + IF(CTEST_TEST_CPACK) + SET(X11_build_target_arg --build-target package) + ELSE(CTEST_TEST_CPACK) + SET(X11_build_target_arg) + ENDIF(CTEST_TEST_CPACK) + + ADD_TEST(X11 ${CMAKE_CTEST_COMMAND} --build-and-test "${CMake_SOURCE_DIR}/Tests/X11" "${CMake_BINARY_DIR}/Tests/X11" @@ -415,6 +421,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=CVS -P ${CMake_SOURCE_DIR}/Utilities/Rel --build-project UseX11 --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM} --build-two-config + ${X11_build_target_arg} --test-command UseX11) LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/X11") |