[Cmake-commits] CMake branch, next, updated. v3.1.0-2308-gaf96f69

Brad King brad.king at kitware.com
Thu Jan 22 09:41:21 EST 2015


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  af96f69116e4f00b46028ef709fef898a53972e1 (commit)
       via  374a66b58ced947d9713dfd6f439a52b6646e923 (commit)
      from  65ebdf17ae3f463dd10862a4f1bec017f2c15cb5 (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=af96f69116e4f00b46028ef709fef898a53972e1
commit af96f69116e4f00b46028ef709fef898a53972e1
Merge: 65ebdf1 374a66b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 22 09:41:21 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 22 09:41:21 2015 -0500

    Merge topic 'GNU-4.4-compile-features' into next
    
    374a66b5 Features: Blacklist raw string literals test for GNU 4.4

diff --cc Tests/CompileFeatures/CMakeLists.txt
index 65e3d98,0642487..ecb463c
--- a/Tests/CompileFeatures/CMakeLists.txt
+++ b/Tests/CompileFeatures/CMakeLists.txt
@@@ -51,18 -51,15 +51,26 @@@ if (CMAKE_CXX_COMPILER_ID STREQUAL "App
    )
  endif()
  
 +if (CMAKE_CXX_COMPILER_ID STREQUAL SunPro)
 +  list(REMOVE_ITEM CXX_non_features
 +    cxx_attribute_deprecated
 +    cxx_contextual_conversions
 +    cxx_extended_friend_declarations
 +    cxx_long_long_type
 +    cxx_sizeof_member
 +    cxx_variadic_macros
 +  )
 +endif()
 +
  if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU"
+     AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.5)
+   # The cxx_raw_string_literals feature happens to work in some distributions
+   # of GNU 4.4, but it is first documented as available with GNU 4.5.
+   list(REMOVE_ITEM CXX_non_features
+     cxx_raw_string_literals
+   )
+ endif()
+ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU"
      AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.6)
    # The cxx_constexpr feature happens to work (for *this* testcase) with
    # GNU 4.5, but it is first documented as available with GNU 4.6.

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=374a66b58ced947d9713dfd6f439a52b6646e923
commit 374a66b58ced947d9713dfd6f439a52b6646e923
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 22 09:39:35 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jan 22 09:39:35 2015 -0500

    Features: Blacklist raw string literals test for GNU 4.4
    
    RedHat gcc 4.4.7-11 supports raw string literals, so simply blacklist
    the test for its rejection.

diff --git a/Tests/CompileFeatures/CMakeLists.txt b/Tests/CompileFeatures/CMakeLists.txt
index a276f36..0642487 100644
--- a/Tests/CompileFeatures/CMakeLists.txt
+++ b/Tests/CompileFeatures/CMakeLists.txt
@@ -52,6 +52,14 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang"
 endif()
 
 if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU"
+    AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.5)
+  # The cxx_raw_string_literals feature happens to work in some distributions
+  # of GNU 4.4, but it is first documented as available with GNU 4.5.
+  list(REMOVE_ITEM CXX_non_features
+    cxx_raw_string_literals
+  )
+endif()
+if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU"
     AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.6)
   # The cxx_constexpr feature happens to work (for *this* testcase) with
   # GNU 4.5, but it is first documented as available with GNU 4.6.

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

Summary of changes:
 Tests/CompileFeatures/CMakeLists.txt |    8 ++++++++
 1 file changed, 8 insertions(+)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list