[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5485-g0fb9852

[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  0fb9852c4285e613141b8445b0a86c1995618791 (commit)
       via  a76dd38827c66d5eca4f56cc9c4e38771f3f6691 (commit)
      from  48787e6f03c0ac3d471a450effc60d0862d9eea6 (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=0fb9852c4285e613141b8445b0a86c1995618791
commit 0fb9852c4285e613141b8445b0a86c1995618791
Merge: 48787e6 a76dd38
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Nov 19 18:40:22 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 19 18:40:22 2013 -0500

    Merge topic 'target_compile_features' into next
    
    a76dd38 Cache the compile features.


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

    Cache the compile features.

diff --git a/Modules/CMakeDetermineCompileFeatures.cmake b/Modules/CMakeDetermineCompileFeatures.cmake
index 7950144..562f871 100644
--- a/Modules/CMakeDetermineCompileFeatures.cmake
+++ b/Modules/CMakeDetermineCompileFeatures.cmake
@@ -41,10 +41,16 @@ function(cmake_determine_compile_features lang)
       )
     endif()
 
-    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)
+    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
+    )
 
     message(STATUS "Detecting ${lang} compile features - done")
   endif()

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

Summary of changes:
 Modules/CMakeDetermineCompileFeatures.cmake |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake