Merge topic 'tests-osx-version'
f53a3340 Tests: Fix OS X version check to use component-wise test
This commit is contained in:
commit
ab09122717
@ -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)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user