diff options
Diffstat (limited to 'Tests/SimpleInstall/CMakeLists.txt')
| -rw-r--r-- | Tests/SimpleInstall/CMakeLists.txt | 26 |
1 files changed, 5 insertions, 21 deletions
diff --git a/Tests/SimpleInstall/CMakeLists.txt b/Tests/SimpleInstall/CMakeLists.txt index 23d3d27..34914b6 100644 --- a/Tests/SimpleInstall/CMakeLists.txt +++ b/Tests/SimpleInstall/CMakeLists.txt @@ -355,27 +355,11 @@ SET(CMAKE_INSTALL_DEBUG_LIBRARIES 1) INCLUDE(InstallRequiredSystemLibraries) INCLUDE(CPack) -# Disable packaging test on Apple 10.3 and below. PackageMaker starts -# DiskManagementTool as root and disowns it -# (http://lists.apple.com/archives/installer-dev/2005/Jul/msg00005.html). -# It is left holding open pipe handles and preventing ProcessUNIX from -# detecting end-of-data even after its immediate child exits. Then -# the test hangs until it times out and is killed. This is a -# well-known bug in kwsys process execution that I would love to get -# time to fix. -SET(PACKAGE_TARGET --build-target package) -IF(APPLE AND NOT CTEST_TEST_CPACK) - EXECUTE_PROCESS( - COMMAND sw_vers -productVersion - OUTPUT_VARIABLE OSX_VERSION - OUTPUT_STRIP_TRAILING_WHITESPACE - ) - IF("${OSX_VERSION}" MATCHES "^10\\.[0123]" OR "${OSX_VERSION}" MATCHES "ProductVersion:\t10\\.[0123]") - MESSAGE(STATUS "Disabling package test on OSX < 10.4") - MESSAGE(STATUS "OSX_VERSION='${OSX_VERSION}'") - SET(PACKAGE_TARGET) - ENDIF("${OSX_VERSION}" MATCHES "^10\\.[0123]" OR "${OSX_VERSION}" MATCHES "ProductVersion:\t10\\.[0123]") -ENDIF(APPLE AND NOT CTEST_TEST_CPACK) +IF(CTEST_TEST_CPACK) + SET(PACKAGE_TARGET --build-target package) +ELSE(CTEST_TEST_CPACK) + SET(PACKAGE_TARGET) +ENDIF(CTEST_TEST_CPACK) ADD_CUSTOM_COMMAND( TARGET ${install_target} |