kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.

Browse Source
This commit is contained in:
David Cole 2007-11-10 06:54:43 -05:00
parent 7859d9332d
commit 6767a658fc
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Tests/SimpleInstall/CMakeLists.txt
View File

@ -355,10 +355,11 @@ IF(APPLE AND NOT CTEST_TEST_CPACK)
OUTPUT_VARIABLE OSX_VERSION OUTPUT_VARIABLE OSX_VERSION
OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_STRIP_TRAILING_WHITESPACE
) )
IF("${OSX_VERSION}" MATCHES "^10\\.[0123]") IF("${OSX_VERSION}" MATCHES "^10\\.[0123]" OR "${OSX_VERSION}" MATCHES "ProductVersion:\t10\\.[0123]")
MESSAGE(STATUS "Disabling package test on OSX ${OSX_VERSION} < 10.4") MESSAGE(STATUS "Disabling package test on OSX < 10.4")
MESSAGE(STATUS "OSX_VERSION='${OSX_VERSION}'")
SET(PACKAGE_TARGET) 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) ENDIF(APPLE AND NOT CTEST_TEST_CPACK)
ADD_CUSTOM_COMMAND( ADD_CUSTOM_COMMAND(

7
Tests/SimpleInstallS2/CMakeLists.txt
View File

@ -355,10 +355,11 @@ IF(APPLE AND NOT CTEST_TEST_CPACK)
OUTPUT_VARIABLE OSX_VERSION OUTPUT_VARIABLE OSX_VERSION
OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_STRIP_TRAILING_WHITESPACE
) )
IF("${OSX_VERSION}" MATCHES "^10\\.[0123]") IF("${OSX_VERSION}" MATCHES "^10\\.[0123]" OR "${OSX_VERSION}" MATCHES "ProductVersion:\t10\\.[0123]")
MESSAGE(STATUS "Disabling package test on OSX ${OSX_VERSION} < 10.4") MESSAGE(STATUS "Disabling package test on OSX < 10.4")
MESSAGE(STATUS "OSX_VERSION='${OSX_VERSION}'")
SET(PACKAGE_TARGET) 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) ENDIF(APPLE AND NOT CTEST_TEST_CPACK)
ADD_CUSTOM_COMMAND( ADD_CUSTOM_COMMAND(