[Cmake-commits] CMake branch, next, updated. v3.1.0-rc1-587-g96d7e9b

[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  96d7e9b761d6d96b7863f8303cff1ae7e59dc132 (commit)
       via  701ba9a306b1733ace9b7eface19bf4cdcdf000d (commit)
       via  4513337a07eac21eae37a8e068e42e117572b640 (commit)
      from  30cd8dce874e234e57cb2b4006971aa9d8bac2f1 (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=96d7e9b761d6d96b7863f8303cff1ae7e59dc132
commit 96d7e9b761d6d96b7863f8303cff1ae7e59dc132
Merge: 30cd8dc 701ba9a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Nov 12 16:54:26 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Nov 12 16:54:26 2014 -0500

    Merge topic 'compile-features-refactor' into next
    
    701ba9a3 Features: Reorder the order of GNU dialect feature tests
    4513337a fixup! fixup! Features: Use the correct dialect flag when recording features.


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

    Features: Reorder the order of GNU dialect feature tests
    
    This doesn't make a difference, but the consistency with other files
    is easier to reason about.

diff --git a/Modules/Compiler/GNU-C.cmake b/Modules/Compiler/GNU-C.cmake
index 66e8cc4..c4a2ed6 100644
--- a/Modules/Compiler/GNU-C.cmake
+++ b/Modules/Compiler/GNU-C.cmake
@@ -21,12 +21,12 @@ macro(cmake_record_c_compile_features)
   endmacro()
 
   if (UNIX AND NOT APPLE AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.7)
-    _get_gcc_features(${CMAKE_C90_STANDARD_COMPILE_OPTION} CMAKE_C90_COMPILE_FEATURES)
+    _get_gcc_features(${CMAKE_C11_STANDARD_COMPILE_OPTION} CMAKE_C11_COMPILE_FEATURES)
     if (_result EQUAL 0)
       _get_gcc_features(${CMAKE_C99_STANDARD_COMPILE_OPTION} CMAKE_C99_COMPILE_FEATURES)
     endif()
     if (_result EQUAL 0)
-      _get_gcc_features(${CMAKE_C11_STANDARD_COMPILE_OPTION} CMAKE_C11_COMPILE_FEATURES)
+      _get_gcc_features(${CMAKE_C90_STANDARD_COMPILE_OPTION} CMAKE_C90_COMPILE_FEATURES)
     endif()
   else()
     set(_result 0)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4513337a07eac21eae37a8e068e42e117572b640
commit 4513337a07eac21eae37a8e068e42e117572b640
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Nov 12 22:51:23 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Nov 12 22:51:56 2014 +0100

    fixup! 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 73980cd..92119ba 100644
--- a/Modules/Compiler/Clang-C.cmake
+++ b/Modules/Compiler/Clang-C.cmake
@@ -25,12 +25,12 @@ macro(cmake_record_c_compile_features)
   endmacro()
 
   if (UNIX AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.4)
-    _get_clang_features(CMAKE_C11_STANDARD_COMPILE_OPTION CMAKE_C11_COMPILE_FEATURES)
+    _get_clang_features(${CMAKE_C11_STANDARD_COMPILE_OPTION} CMAKE_C11_COMPILE_FEATURES)
     if (_result EQUAL 0)
-      _get_clang_features(CMAKE_C99_STANDARD_COMPILE_OPTION CMAKE_C99_COMPILE_FEATURES)
+      _get_clang_features(${CMAKE_C99_STANDARD_COMPILE_OPTION} CMAKE_C99_COMPILE_FEATURES)
     endif()
     if (_result EQUAL 0)
-      _get_clang_features(CMAKE_C90_STANDARD_COMPILE_OPTION 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 5f90dc5..66e8cc4 100644
--- a/Modules/Compiler/GNU-C.cmake
+++ b/Modules/Compiler/GNU-C.cmake
@@ -23,10 +23,10 @@ macro(cmake_record_c_compile_features)
   if (UNIX AND NOT APPLE AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.7)
     _get_gcc_features(${CMAKE_C90_STANDARD_COMPILE_OPTION} CMAKE_C90_COMPILE_FEATURES)
     if (_result EQUAL 0)
-      _get_gcc_features(CMAKE_C99_STANDARD_COMPILE_OPTION CMAKE_C99_COMPILE_FEATURES)
+      _get_gcc_features(${CMAKE_C99_STANDARD_COMPILE_OPTION} CMAKE_C99_COMPILE_FEATURES)
     endif()
     if (_result EQUAL 0)
-      _get_gcc_features(CMAKE_C11_STANDARD_COMPILE_OPTION 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 |    6 +++---
 Modules/Compiler/GNU-C.cmake   |    6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake