[Cmake-commits] CMake branch, next, updated. v3.1.0-rc3-1155-g0154b57

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  0154b576c4d9bcf98d0ee3964110cd684ba95241 (commit)
       via  f53a3340bbb6ca4fa57c21187206df8160221d4d (commit)
      from  9f5d54ee3c08429917803a9e855f936c7265471f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0154b576c4d9bcf98d0ee3964110cd684ba95241
commit 0154b576c4d9bcf98d0ee3964110cd684ba95241
Merge: 9f5d54e f53a334
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Dec 12 15:16:47 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Dec 12 15:16:47 2014 -0500

    Merge topic 'tests-osx-version' into next
    
    f53a3340 Tests: Fix OS X version check to use component-wise test


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f53a3340bbb6ca4fa57c21187206df8160221d4d
commit f53a3340bbb6ca4fa57c21187206df8160221d4d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Dec 12 15:08:00 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Dec 12 15:11:37 2014 -0500

    Tests: Fix OS X version check to use component-wise test
    
    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 at rogue-research.com>

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)

-----------------------------------------------------------------------

Summary of changes:
 Tests/CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake