[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5031-g9a65a09

[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  9a65a0953a6f0e509ab7162d9db9928c89d10f33 (commit)
       via  51291c602344ffe1088ef29ca887a8bf6c24a0be (commit)
       via  1026b96a019dc73e3caf84c5f389e9bd1c032386 (commit)
      from  ce549249294c112404307ed92cd7d180e09a253a (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=9a65a0953a6f0e509ab7162d9db9928c89d10f33
commit 9a65a0953a6f0e509ab7162d9db9928c89d10f33
Merge: ce54924 51291c6
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Nov 10 04:21:20 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Nov 10 04:21:20 2013 -0500

    Merge topic 'target_compile_features' into next
    
    51291c6 Only populate Clang features if CMP0025 is NEW.
    1026b96 Don't load Clang-CXX from AppleClang-CXX.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=51291c602344ffe1088ef29ca887a8bf6c24a0be
commit 51291c602344ffe1088ef29ca887a8bf6c24a0be
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Nov 10 10:19:46 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Nov 10 10:19:46 2013 +0100

    Only populate Clang features if CMP0025 is NEW.
    
    That policy determines whether the version corresponds to the
    upstream versioning of Clang or the different versioning system
    of AppleClang.

diff --git a/Modules/Compiler/Clang-CXX.cmake b/Modules/Compiler/Clang-CXX.cmake
index f70601f..31a3358 100644
--- a/Modules/Compiler/Clang-CXX.cmake
+++ b/Modules/Compiler/Clang-CXX.cmake
@@ -5,6 +5,11 @@ if(NOT CMAKE_CXX_SIMULATE_ID STREQUAL "MSVC")
   set(CMAKE_CXX_COMPILE_OPTIONS_VISIBILITY_INLINES_HIDDEN "-fvisibility-inlines-hidden")
 endif()
 
+cmake_policy(GET CMP0025 appleClangPolicy)
+if(NOT appleClangPolicy STREQUAL NEW)
+  return()
+endif()
+
 set(CMAKE_CXX98_COMPILE_EXTENSIONS)
 set(CMAKE_CXX11_COMPILE_FEATURES)
 set(CMAKE_CXX11_COMPILE_EXTENSIONS)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1026b96a019dc73e3caf84c5f389e9bd1c032386
commit 1026b96a019dc73e3caf84c5f389e9bd1c032386
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Nov 10 10:11:29 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Nov 10 10:15:45 2013 +0100

    Don't load Clang-CXX from AppleClang-CXX.
    
    The Clang-CXX module has version-specific checks, and the version
    system for AppleClang is not the same as Clang.

diff --git a/Modules/Compiler/AppleClang-CXX.cmake b/Modules/Compiler/AppleClang-CXX.cmake
index 680f720..0372e18 100644
--- a/Modules/Compiler/AppleClang-CXX.cmake
+++ b/Modules/Compiler/AppleClang-CXX.cmake
@@ -1 +1,6 @@
-include(Compiler/Clang-CXX)
+include(Compiler/Clang)
+__compiler_clang(CXX)
+
+if(NOT CMAKE_CXX_SIMULATE_ID STREQUAL "MSVC")
+  set(CMAKE_CXX_COMPILE_OPTIONS_VISIBILITY_INLINES_HIDDEN "-fvisibility-inlines-hidden")
+endif()

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

Summary of changes:
 Modules/Compiler/AppleClang-CXX.cmake |    7 ++++++-
 Modules/Compiler/Clang-CXX.cmake      |    5 +++++
 2 files changed, 11 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake