summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-12-15 16:06:51 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2014-12-15 16:06:51 (GMT)
commitab09122717ff8138086cd46787f0badbba0f5669 (patch)
tree32342742e38bb26c9a70961f379f16815dc57aba
parent872ad7a26d9cfeec877d148a49e10d18e29141bf (diff)
parentf53a3340bbb6ca4fa57c21187206df8160221d4d (diff)
downloadCMake-ab09122717ff8138086cd46787f0badbba0f5669.zip
CMake-ab09122717ff8138086cd46787f0badbba0f5669.tar.gz
CMake-ab09122717ff8138086cd46787f0badbba0f5669.tar.bz2
Merge topic 'tests-osx-version'
f53a3340 Tests: Fix OS X version check to use component-wise test
-rw-r--r--Tests/CMakeLists.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index fda9359..33c18ce 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -171,7 +171,7 @@ if(BUILD_TESTING)
OUTPUT_VARIABLE OSX_VERSION
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 "OSX_VERSION='${OSX_VERSION}'")
set(CTEST_TEST_CPACK OFF)