summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Cole <david.cole@kitware.com>2007-11-10 11:54:43 (GMT)
committerDavid Cole <david.cole@kitware.com>2007-11-10 11:54:43 (GMT)
commit6767a658fc32b6b49b4ea97d75826e6b60d4c6f7 (patch)
tree55df622762bd89f0df44da2b5a61d5c5ce4274dd
parent7859d9332dfba1128f299c7701622f2a30525296 (diff)
downloadCMake-6767a658fc32b6b49b4ea97d75826e6b60d4c6f7.zip
CMake-6767a658fc32b6b49b4ea97d75826e6b60d4c6f7.tar.gz
CMake-6767a658fc32b6b49b4ea97d75826e6b60d4c6f7.tar.bz2
BUG: Need extra regex to parse sw_vers output on Mac OSX 10.2 (and presumably earlier) to avoid running PackageMaker during the SimpleInstall* tests. See comment in CMake/Tests/SimpleInstall/CMakeLists.txt for more info.
-rw-r--r--Tests/SimpleInstall/CMakeLists.txt7
-rw-r--r--Tests/SimpleInstallS2/CMakeLists.txt7
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(