[cmake-commits] david.cole committed CMakeLists.txt 1.90 1.91

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Tests/SimpleInstall
In directory public:/mounts/ram/cvs-serv28047/Tests/SimpleInstall

Modified Files:
	CMakeLists.txt 
Log Message:
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.


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/SimpleInstall/CMakeLists.txt,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -d -r1.90 -r1.91
--- CMakeLists.txt	15 Oct 2007 11:08:15 -0000	1.90
+++ CMakeLists.txt	10 Nov 2007 11:54:43 -0000	1.91
@@ -355,10 +355,11 @@
     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(