[Cmake-commits] CMake branch, master, updated. v3.1.0-907-g813ace9

Brad King brad.king at kitware.com
Mon Jan 19 13:55:33 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, master has been updated
       via  813ace90e4d02a782176ea13bcec15a3e9338210 (commit)
       via  004e1540e0870e9b3bde19ad16c4f50b7d22df73 (commit)
       via  2a5ca650c9f973c83fe3d5b070f6313e1bd536c1 (commit)
       via  1ae2c6b2c9def9f0d0db3a808290d485eccf062c (commit)
       via  c66e3317492709ab3b830024f67021dde67a7fe5 (commit)
       via  c43a6dc5ec2ac57d8334beeabf90de43e8ddb829 (commit)
       via  782591350ced90d4289d220f91bdbdb4acec2ba6 (commit)
       via  7b9fc88b045fd34df73e3cc864c9ac924a449cd3 (commit)
      from  137a15bf1da72c795d8eeded4ad3848a5692dce6 (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=813ace90e4d02a782176ea13bcec15a3e9338210
commit 813ace90e4d02a782176ea13bcec15a3e9338210
Merge: 137a15b 004e154
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 19 13:55:31 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 19 13:55:31 2015 -0500

    Merge topic 'GNU-4.4-compile-features'
    
    004e1540 Features: Record for GNU 4.4.
    2a5ca650 Features: Wrap failure-test in UNIX condition.
    1ae2c6b2 Features: Blacklist cxx_constexpr test for GNU 4.5.
    c66e3317 Features: Use a more-common feature in cycle-test.
    c43a6dc5 Features: Update comment in test to match the code.
    78259135 Features: Test presence of cxx_auto_type with genex.
    7b9fc88b Features: Remove outdated comment.

diff --cc Tests/CompileFeatures/CMakeLists.txt
index 182954e,ccd6f30..5cd0836
--- 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.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.
+   list(REMOVE_ITEM CXX_non_features
+     cxx_constexpr
+   )
+ endif()
+ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU"
      AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8)
    # The cxx_alignof feature happens to work (for *this* testcase) with
    # GNU 4.7, but it is first documented as available with GNU 4.8.

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

Summary of changes:
 ...compile-features.rst => GNU-4.4-compile-features.rst} |    4 ++--
 Modules/Compiler/GNU-C-FeatureTests.cmake                |    4 ++--
 Modules/Compiler/GNU-C.cmake                             |    6 +++---
 Modules/Compiler/GNU-CXX-FeatureTests.cmake              |    9 +++------
 Modules/Compiler/GNU-CXX.cmake                           |    6 +++---
 Tests/CompileFeatures/CMakeLists.txt                     |   14 +++++++++++---
 Tests/CompileFeatures/genex_test.cpp                     |   13 +++----------
 Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt |   14 ++++++++------
 .../CompileFeatures/LinkImplementationFeatureCycle.cmake |    6 +++---
 9 files changed, 38 insertions(+), 38 deletions(-)
 rename Help/release/dev/{GNU-4.6-compile-features.rst => GNU-4.4-compile-features.rst} (52%)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list