[Cmake-commits] CMake branch, next, updated. v2.8.12-4404-g2dc8d71

[Stephen Kelly]

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  2dc8d713e71f449e1b3eab1510b2ecd6b88300de (commit)
       via  3dec32b6d4cb1e1c553a9c0d4f1c5e1b94b16306 (commit)
      from  7783cbe78f0c635355d4840da59b3aeb8215e90c (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=2dc8d713e71f449e1b3eab1510b2ecd6b88300de
commit 2dc8d713e71f449e1b3eab1510b2ecd6b88300de
Merge: 7783cbe 3dec32b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 24 02:52:17 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 24 02:52:17 2013 -0400

    Merge topic 'target_compiler_features' into next
    
    3dec32b Run CxxDialect test only if compile options are available.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3dec32b6d4cb1e1c553a9c0d4f1c5e1b94b16306
commit 3dec32b6d4cb1e1c553a9c0d4f1c5e1b94b16306
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 24 08:44:55 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Oct 24 08:50:18 2013 +0200

    Run CxxDialect test only if compile options are available.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index fa682b0..1583c72 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -247,7 +247,10 @@ if(BUILD_TESTING)
   ADD_TEST_MACRO(CompatibleInterface CompatibleInterface)
   ADD_TEST_MACRO(AliasTarget AliasTarget)
   ADD_TEST_MACRO(InterfaceLibrary InterfaceLibrary)
-  if(CMAKE_CXX_COMPILER_ID STREQUAL GNU OR CMAKE_CXX_COMPILER_ID STREQUAL Clang)
+  if((CMAKE_CXX_COMPILER_ID STREQUAL GNU
+        AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.6)
+      OR (CMAKE_CXX_COMPILER_ID STREQUAL Clang
+        AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 2.9))
     ADD_TEST_MACRO(CxxDialect CxxDialect)
   endif()
   set_tests_properties(EmptyLibrary PROPERTIES

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

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


hooks/post-receive
-- 
CMake