[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5505-gc4a07de

[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  c4a07ded25bc750562815c859f55ab7cd78feec9 (commit)
       via  e10b0eff4305e3eb85cd9e8a08827917fd9dc7cb (commit)
       via  993ff2e12ff9caf3127d7af1b8aa36263243f77b (commit)
      from  b6feec233553bbd93bb900c08ccb9322931044f0 (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=c4a07ded25bc750562815c859f55ab7cd78feec9
commit c4a07ded25bc750562815c859f55ab7cd78feec9
Merge: b6feec2 e10b0ef
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Nov 20 09:11:30 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Nov 20 09:11:30 2013 -0500

    Merge topic 'target_compile_features' into next
    
    e10b0ef Record the compiler features in CMake<lang>Compiler.cmake.
    993ff2e Revert "Cache the compile features."


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e10b0eff4305e3eb85cd9e8a08827917fd9dc7cb
commit e10b0eff4305e3eb85cd9e8a08827917fd9dc7cb
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Nov 20 15:10:37 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Nov 20 15:10:37 2013 +0100

    Record the compiler features in CMake<lang>Compiler.cmake.

diff --git a/Modules/CMakeCCompiler.cmake.in b/Modules/CMakeCCompiler.cmake.in
index 804cce2..59d88fb 100644
--- a/Modules/CMakeCCompiler.cmake.in
+++ b/Modules/CMakeCCompiler.cmake.in
@@ -2,6 +2,7 @@ set(CMAKE_C_COMPILER "@CMAKE_C_COMPILER@")
 set(CMAKE_C_COMPILER_ARG1 "@CMAKE_C_COMPILER_ARG1@")
 set(CMAKE_C_COMPILER_ID "@CMAKE_C_COMPILER_ID@")
 set(CMAKE_C_COMPILER_VERSION "@CMAKE_C_COMPILER_VERSION@")
+set(CMAKE_C_COMPILE_FEATURES "@CMAKE_C_COMPILE_FEATURES@")
 set(CMAKE_C_PLATFORM_ID "@CMAKE_C_PLATFORM_ID@")
 set(CMAKE_C_SIMULATE_ID "@CMAKE_C_SIMULATE_ID@")
 set(CMAKE_C_SIMULATE_VERSION "@CMAKE_C_SIMULATE_VERSION@")
diff --git a/Modules/CMakeCXXCompiler.cmake.in b/Modules/CMakeCXXCompiler.cmake.in
index 35aa6c4..f638147 100644
--- a/Modules/CMakeCXXCompiler.cmake.in
+++ b/Modules/CMakeCXXCompiler.cmake.in
@@ -2,6 +2,7 @@ set(CMAKE_CXX_COMPILER "@CMAKE_CXX_COMPILER@")
 set(CMAKE_CXX_COMPILER_ARG1 "@CMAKE_CXX_COMPILER_ARG1@")
 set(CMAKE_CXX_COMPILER_ID "@CMAKE_CXX_COMPILER_ID@")
 set(CMAKE_CXX_COMPILER_VERSION "@CMAKE_CXX_COMPILER_VERSION@")
+set(CMAKE_CXX_COMPILE_FEATURES "@CMAKE_CXX_COMPILE_FEATURES@")
 set(CMAKE_CXX_PLATFORM_ID "@CMAKE_CXX_PLATFORM_ID@")
 set(CMAKE_CXX_SIMULATE_ID "@CMAKE_CXX_SIMULATE_ID@")
 set(CMAKE_CXX_SIMULATE_VERSION "@CMAKE_CXX_SIMULATE_VERSION@")

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=993ff2e12ff9caf3127d7af1b8aa36263243f77b
commit 993ff2e12ff9caf3127d7af1b8aa36263243f77b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Nov 20 15:08:32 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Nov 20 15:08:32 2013 +0100

    Revert "Cache the compile features."
    
    This reverts commit a76dd38827c66d5eca4f56cc9c4e38771f3f6691.

diff --git a/Modules/CMakeDetermineCompileFeatures.cmake b/Modules/CMakeDetermineCompileFeatures.cmake
index 562f871..7950144 100644
--- a/Modules/CMakeDetermineCompileFeatures.cmake
+++ b/Modules/CMakeDetermineCompileFeatures.cmake
@@ -41,16 +41,10 @@ function(cmake_determine_compile_features lang)
       )
     endif()
 
-    set(CMAKE_CXX_COMPILE_FEATURES ${CMAKE_CXX_COMPILE_FEATURES} CACHE STRING "CMAKE_CXX_COMPILE_FEATURES")
-    set(CMAKE_CXX98_COMPILE_EXTENSIONS ${CMAKE_CXX98_COMPILE_EXTENSIONS} CACHE STRING "CMAKE_CXX98_COMPILE_EXTENSIONS")
-    set(CMAKE_CXX11_COMPILE_FEATURES ${CMAKE_CXX11_COMPILE_FEATURES}  CACHE STRING "CMAKE_CXX11_COMPILE_FEATURES")
-    set(CMAKE_CXX11_COMPILE_EXTENSIONS ${CMAKE_CXX11_COMPILE_EXTENSIONS}  CACHE STRING "CMAKE_CXX11_COMPILE_EXTENSIONS")
-    mark_as_advanced(
-      CMAKE_CXX_COMPILE_FEATURES
-      CMAKE_CXX98_COMPILE_EXTENSIONS
-      CMAKE_CXX11_COMPILE_FEATURES
-      CMAKE_CXX11_COMPILE_EXTENSIONS
-    )
+    set(CMAKE_CXX_COMPILE_FEATURES ${CMAKE_CXX_COMPILE_FEATURES} PARENT_SCOPE)
+    set(CMAKE_CXX98_COMPILE_EXTENSIONS ${CMAKE_CXX98_COMPILE_EXTENSIONS} PARENT_SCOPE)
+    set(CMAKE_CXX11_COMPILE_FEATURES ${CMAKE_CXX11_COMPILE_FEATURES} PARENT_SCOPE)
+    set(CMAKE_CXX11_COMPILE_EXTENSIONS ${CMAKE_CXX11_COMPILE_EXTENSIONS} PARENT_SCOPE)
 
     message(STATUS "Detecting ${lang} compile features - done")
   endif()

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

Summary of changes:
 Modules/CMakeCCompiler.cmake.in             |    1 +
 Modules/CMakeCXXCompiler.cmake.in           |    1 +
 Modules/CMakeDetermineCompileFeatures.cmake |   14 ++++----------
 3 files changed, 6 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
CMake