[Cmake-commits] CMake branch, next, updated. v3.3.1-2795-g25bd677

Brad King brad.king at kitware.com
Wed Sep 9 09:33:40 EDT 2015


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  25bd677f8135f6d574ed66576a39de20fd0ff6c4 (commit)
       via  2fbc41f38ae07c6c5943750b000296cd69a8b03b (commit)
       via  0e7f34c0a9a6ad8dbcdad32910d87b8d8671cd51 (commit)
      from  923d2bae0c5d7a234c901ee2cc24ee295e0369af (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=25bd677f8135f6d574ed66576a39de20fd0ff6c4
commit 25bd677f8135f6d574ed66576a39de20fd0ff6c4
Merge: 923d2ba 2fbc41f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 9 09:33:39 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Sep 9 09:33:39 2015 -0400

    Merge topic 'mingw-compile-features-C' into next
    
    2fbc41f3 Record compile features for GNU C on Windows (#15727)
    0e7f34c0 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2fbc41f38ae07c6c5943750b000296cd69a8b03b
commit 2fbc41f38ae07c6c5943750b000296cd69a8b03b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 9 09:32:46 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Sep 9 09:32:46 2015 -0400

    Record compile features for GNU C on Windows (#15727)
    
    Drop the 'UNIX' condition on GNU C compiler features.

diff --git a/Help/release/dev/mingw-compile-features-C.rst b/Help/release/dev/mingw-compile-features-C.rst
new file mode 100644
index 0000000..b3f99f1
--- /dev/null
+++ b/Help/release/dev/mingw-compile-features-C.rst
@@ -0,0 +1,5 @@
+mingw-compile-features-C
+------------------------
+
+* The :manual:`Compile Features <cmake-compile-features(7)>` functionality
+  is now aware of features supported by GNU C compilers on Windows.
diff --git a/Modules/Compiler/GNU-C.cmake b/Modules/Compiler/GNU-C.cmake
index 89704e6..031ab73 100644
--- a/Modules/Compiler/GNU-C.cmake
+++ b/Modules/Compiler/GNU-C.cmake
@@ -34,10 +34,10 @@ macro(cmake_record_c_compile_features)
   endmacro()
 
   set(_result 0)
-  if (UNIX AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.6)
+  if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.6)
     _get_gcc_features(${CMAKE_C11_STANDARD_COMPILE_OPTION} CMAKE_C11_COMPILE_FEATURES)
   endif()
-  if (UNIX AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.4)
+  if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.4)
     if (_result EQUAL 0)
       _get_gcc_features(${CMAKE_C99_STANDARD_COMPILE_OPTION} CMAKE_C99_COMPILE_FEATURES)
     endif()

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

Summary of changes:
 Help/release/dev/mingw-compile-features-C.rst |    5 +++++
 Modules/Compiler/GNU-C.cmake                  |    4 ++--
 Source/CMakeVersion.cmake                     |    2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 Help/release/dev/mingw-compile-features-C.rst


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list