diff options
| -rw-r--r-- | Tests/SimpleInstall/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | Tests/SimpleInstallS2/CMakeLists.txt | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/Tests/SimpleInstall/CMakeLists.txt b/Tests/SimpleInstall/CMakeLists.txt index e1de4bd..23930d4 100644 --- a/Tests/SimpleInstall/CMakeLists.txt +++ b/Tests/SimpleInstall/CMakeLists.txt @@ -355,10 +355,11 @@ IF(APPLE AND NOT CTEST_TEST_CPACK) OUTPUT_VARIABLE OSX_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE ) - IF("${OSX_VERSION}" MATCHES "^10\\.[0123]") - MESSAGE(STATUS "Disabling package test on OSX ${OSX_VERSION} < 10.4") + 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]") + ENDIF("${OSX_VERSION}" MATCHES "^10\\.[0123]" OR "${OSX_VERSION}" MATCHES "ProductVersion:\t10\\.[0123]") ENDIF(APPLE AND NOT CTEST_TEST_CPACK) ADD_CUSTOM_COMMAND( diff --git a/Tests/SimpleInstallS2/CMakeLists.txt b/Tests/SimpleInstallS2/CMakeLists.txt index e1de4bd..23930d4 100644 --- a/Tests/SimpleInstallS2/CMakeLists.txt +++ b/Tests/SimpleInstallS2/CMakeLists.txt @@ -355,10 +355,11 @@ IF(APPLE AND NOT CTEST_TEST_CPACK) OUTPUT_VARIABLE OSX_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE ) - IF("${OSX_VERSION}" MATCHES "^10\\.[0123]") - MESSAGE(STATUS "Disabling package test on OSX ${OSX_VERSION} < 10.4") + 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]") + ENDIF("${OSX_VERSION}" MATCHES "^10\\.[0123]" OR "${OSX_VERSION}" MATCHES "ProductVersion:\t10\\.[0123]") ENDIF(APPLE AND NOT CTEST_TEST_CPACK) ADD_CUSTOM_COMMAND( |