[Cmake-commits] CMake branch, next, updated. v3.1.0-rc1-584-g30cd8dc

[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  30cd8dce874e234e57cb2b4006971aa9d8bac2f1 (commit)
       via  4ba28364d51fbd2cbc752fea14941c059108fe00 (commit)
      from  b4ef17f26419a00dc6cad0e9c9319d1983235a0b (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=30cd8dce874e234e57cb2b4006971aa9d8bac2f1
commit 30cd8dce874e234e57cb2b4006971aa9d8bac2f1
Merge: b4ef17f 4ba2836
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Nov 12 16:49:22 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Nov 12 16:49:22 2014 -0500

    Merge topic 'compile-features-refactor' into next
    
    4ba28364 fixup! Features: Use the correct dialect flag when recording features.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4ba28364d51fbd2cbc752fea14941c059108fe00
commit 4ba28364d51fbd2cbc752fea14941c059108fe00
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Nov 12 22:49:02 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Nov 12 22:49:02 2014 +0100

    fixup! Features: Use the correct dialect flag when recording features.

diff --git a/Modules/Compiler/Clang-C.cmake b/Modules/Compiler/Clang-C.cmake
index 05d3c0b..73980cd 100644
--- a/Modules/Compiler/Clang-C.cmake
+++ b/Modules/Compiler/Clang-C.cmake
@@ -21,16 +21,16 @@ set(CMAKE_C_STANDARD_DEFAULT 90)
 
 macro(cmake_record_c_compile_features)
   macro(_get_clang_features std_version list)
-    record_compiler_features(C "-std=${std_version}" ${list})
+    record_compiler_features(C "${std_version}" ${list})
   endmacro()
 
   if (UNIX AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.4)
-    _get_clang_features(c11 CMAKE_C11_COMPILE_FEATURES)
+    _get_clang_features(CMAKE_C11_STANDARD_COMPILE_OPTION CMAKE_C11_COMPILE_FEATURES)
     if (_result EQUAL 0)
-      _get_clang_features(c99 CMAKE_C99_COMPILE_FEATURES)
+      _get_clang_features(CMAKE_C99_STANDARD_COMPILE_OPTION CMAKE_C99_COMPILE_FEATURES)
     endif()
     if (_result EQUAL 0)
-      _get_clang_features(c90 CMAKE_C90_COMPILE_FEATURES)
+      _get_clang_features(CMAKE_C90_STANDARD_COMPILE_OPTION CMAKE_C90_COMPILE_FEATURES)
     endif()
   else()
     set(_result 0)
diff --git a/Modules/Compiler/GNU-C.cmake b/Modules/Compiler/GNU-C.cmake
index 35954be..5f90dc5 100644
--- a/Modules/Compiler/GNU-C.cmake
+++ b/Modules/Compiler/GNU-C.cmake
@@ -17,16 +17,16 @@ set(CMAKE_C_STANDARD_DEFAULT 90)
 
 macro(cmake_record_c_compile_features)
   macro(_get_gcc_features std_version list)
-    record_compiler_features(C "-std=${std_version}" ${list})
+    record_compiler_features(C "${std_version}" ${list})
   endmacro()
 
   if (UNIX AND NOT APPLE AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.7)
-    _get_gcc_features(c90 CMAKE_C90_COMPILE_FEATURES)
+    _get_gcc_features(${CMAKE_C90_STANDARD_COMPILE_OPTION} CMAKE_C90_COMPILE_FEATURES)
     if (_result EQUAL 0)
-      _get_gcc_features(c99 CMAKE_C99_COMPILE_FEATURES)
+      _get_gcc_features(CMAKE_C99_STANDARD_COMPILE_OPTION CMAKE_C99_COMPILE_FEATURES)
     endif()
     if (_result EQUAL 0)
-      _get_gcc_features(c11 CMAKE_C11_COMPILE_FEATURES)
+      _get_gcc_features(CMAKE_C11_STANDARD_COMPILE_OPTION CMAKE_C11_COMPILE_FEATURES)
     endif()
   else()
     set(_result 0)

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

Summary of changes:
 Modules/Compiler/Clang-C.cmake |    8 ++++----
 Modules/Compiler/GNU-C.cmake   |    8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
CMake