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

Tests: Fix OS X version check to use component-wise test

Browse Source 
Otherwise 10.10 may be considered to be less than 10.4 and the
tests for CPack will not run.

Reported-by: Sean McBride <sean@rogue-research.com>
This commit is contained in:
Brad King 2014-12-12 15:08:00 -05:00
parent a829f09bdd
commit f53a3340bb
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Tests/CMakeLists.txt
View File

@ -171,7 +171,7 @@ if(BUILD_TESTING)
OUTPUT_VARIABLE OSX_VERSION OUTPUT_VARIABLE OSX_VERSION
OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_STRIP_TRAILING_WHITESPACE
) )
if(OSX_VERSION MATCHES "^10\\.[0123]" OR OSX_VERSION MATCHES "ProductVersion:\t10\\.[0123]") if(OSX_VERSION VERSION_LESS 10.4)
message(STATUS "Forcing CTEST_TEST_CPACK=OFF on OSX < 10.4") message(STATUS "Forcing CTEST_TEST_CPACK=OFF on OSX < 10.4")
message(STATUS "OSX_VERSION='${OSX_VERSION}'") message(STATUS "OSX_VERSION='${OSX_VERSION}'")
set(CTEST_TEST_CPACK OFF) set(CTEST_TEST_CPACK OFF)