Ver código fonte

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.

David Cole 18 anos atrás
pai
commit
6767a658fc

+ 4 - 3
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(

+ 4 - 3
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(