[Cmake-commits] CMake branch, next, updated. v3.1.0-rc2-769-g7ca9ac4

Stephen Kelly steveire at gmail.com
Thu Nov 20 16:12:33 EST 2014


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  7ca9ac40d619d48792f5c2cc35c4c2ca6dd5fef4 (commit)
       via  36bb100e2b4e5586cecb0dc4e4488b3e8dd18f69 (commit)
      from  d8e425c37bb9c0a3b3bba8651eedc3646c421067 (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=7ca9ac40d619d48792f5c2cc35c4c2ca6dd5fef4
commit 7ca9ac40d619d48792f5c2cc35c4c2ca6dd5fef4
Merge: d8e425c 36bb100
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Nov 20 16:12:32 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Nov 20 16:12:32 2014 -0500

    Merge topic 'default-lang-dialect' into next
    
    36bb100e Fix the test for running the CxxDialog unit test.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=36bb100e2b4e5586cecb0dc4e4488b3e8dd18f69
commit 36bb100e2b4e5586cecb0dc4e4488b3e8dd18f69
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Nov 20 22:09:20 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Nov 20 22:10:25 2014 +0100

    Fix the test for running the CxxDialog unit test.
    
    The existing versions have been used since commit
    v3.1.0-rc1~635^2~8 (cmTarget: Add CXX_STANDARD and CXX_EXTENSION
    target properties., 2013-10-13), but further discussions since then
    increased the initial minimum compiler versions this feature is
    available for.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 25cc846..a9cad14 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -292,11 +292,11 @@ if(BUILD_TESTING)
   endif()
   ADD_TEST_MACRO(SourcesProperty SourcesProperty)
   if(CMAKE_CXX_COMPILER_ID STREQUAL GNU
-      AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.6)
+      AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.7)
     set(runCxxDialectTest 1)
   endif()
   if(CMAKE_CXX_COMPILER_ID STREQUAL Clang
-        AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 2.9)
+        AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.4)
     if(NOT APPLE OR POLICY CMP0025)
       set(runCxxDialectTest 1)
     endif()

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

Summary of changes:
 Tests/CMakeLists.txt |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list