[Cmake-commits] CMake branch, next, updated. v3.0.0-rc5-3142-g27da992

[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  27da992426b38969cf1399a7018a5b6f005f6b71 (commit)
       via  920598131076f18bfe2c051c30e48d75deb1dcd2 (commit)
       via  5c04dfe465d85be3d11f37d16d6ebcafbdcb7d53 (commit)
      from  e27333898cef5944c617d0bcc544b44d9e4b8faa (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=27da992426b38969cf1399a7018a5b6f005f6b71
commit 27da992426b38969cf1399a7018a5b6f005f6b71
Merge: e273338 9205981
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed May 14 18:06:06 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed May 14 18:06:06 2014 -0400

    Merge topic 'minor-cleanups' into next
    
    92059813 Features: Use the features symbol in the feature-test compile.
    5c04dfe4 Features: Only require AppleClang policy to be NEW on APPLE.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=920598131076f18bfe2c051c30e48d75deb1dcd2
commit 920598131076f18bfe2c051c30e48d75deb1dcd2
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed May 14 23:56:53 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed May 14 23:56:53 2014 +0200

    Features: Use the features symbol in the feature-test compile.
    
    Clang discards the entire string if it is not used, removing
    the ability to read the features from the compiled binary. That
    is prevented by using the symbol.

diff --git a/Modules/Internal/FeatureTesting.cmake b/Modules/Internal/FeatureTesting.cmake
index 7bf6d91..bea1cfa 100644
--- a/Modules/Internal/FeatureTesting.cmake
+++ b/Modules/Internal/FeatureTesting.cmake
@@ -20,7 +20,7 @@ macro(record_compiler_features lang compile_flags feature_list)
     endif()
   endforeach()
   file(APPEND "${CMAKE_BINARY_DIR}/CMakeFiles/feature_tests.${lang_lc}"
-    "\n};\n\nint main() { return 0; }\n")
+    "\n};\n\nint main() { (void)features; return 0; }\n")
 
   try_compile(CMAKE_${lang}_FEATURE_TEST
     ${CMAKE_BINARY_DIR} "${CMAKE_BINARY_DIR}/CMakeFiles/feature_tests.${lang_lc}"

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5c04dfe465d85be3d11f37d16d6ebcafbdcb7d53
commit 5c04dfe465d85be3d11f37d16d6ebcafbdcb7d53
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed May 14 23:55:34 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed May 14 23:55:34 2014 +0200

    Features: Only require AppleClang policy to be NEW on APPLE.

diff --git a/Modules/Compiler/Clang-CXX.cmake b/Modules/Compiler/Clang-CXX.cmake
index a1b3a10..0409c24 100644
--- a/Modules/Compiler/Clang-CXX.cmake
+++ b/Modules/Compiler/Clang-CXX.cmake
@@ -6,7 +6,7 @@ if(NOT CMAKE_CXX_SIMULATE_ID STREQUAL "MSVC")
 endif()
 
 cmake_policy(GET CMP0025 appleClangPolicy)
-if(NOT appleClangPolicy STREQUAL NEW)
+if(APPLE AND NOT appleClangPolicy STREQUAL NEW)
   return()
 endif()
 

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

Summary of changes:
 Modules/Compiler/Clang-CXX.cmake      |    2 +-
 Modules/Internal/FeatureTesting.cmake |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake