[Cmake-commits] CMake branch, next, updated. v3.4.1-1897-gf3ea5a5

Brad King brad.king at kitware.com
Mon Jan 11 10:18:44 EST 2016


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  f3ea5a599f958e20a28e10365bc07253271cde04 (commit)
       via  3baca6364bb1569e6856337d80e54b37a96d017e (commit)
      from  ebf86b8bf65ec96e48f814d3f454106201df3538 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f3ea5a599f958e20a28e10365bc07253271cde04
commit f3ea5a599f958e20a28e10365bc07253271cde04
Merge: ebf86b8 3baca63
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 11 10:18:43 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 11 10:18:43 2016 -0500

    Merge topic 'mingw-clang-compile-features' into next
    
    3baca636 Record compile features for MinGW Clang on Windows (#15897)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3baca6364bb1569e6856337d80e54b37a96d017e
commit 3baca6364bb1569e6856337d80e54b37a96d017e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 11 10:08:01 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 11 10:13:18 2016 -0500

    Record compile features for MinGW Clang on Windows (#15897)
    
    Drop the 'UNIX' condition on Clang compiler features.  This enables
    use of compile features with MinGW Clang, though additional work may
    be needed for clang-cl.

diff --git a/Help/release/dev/mingw-clang-compile-features.rst b/Help/release/dev/mingw-clang-compile-features.rst
new file mode 100644
index 0000000..5b1fb96
--- /dev/null
+++ b/Help/release/dev/mingw-clang-compile-features.rst
@@ -0,0 +1,5 @@
+mingw-clang-compile-features
+----------------------------
+
+* The :manual:`Compile Features <cmake-compile-features(7)>` functionality
+  is now aware of features supported by Clang compilers on Windows (MinGW).
diff --git a/Modules/Compiler/Clang-CXX.cmake b/Modules/Compiler/Clang-CXX.cmake
index 6a0a5e2..dc62711 100644
--- a/Modules/Compiler/Clang-CXX.cmake
+++ b/Modules/Compiler/Clang-CXX.cmake
@@ -6,7 +6,7 @@ if(NOT "x${CMAKE_CXX_SIMULATE_ID}" STREQUAL "xMSVC")
 endif()
 
 cmake_policy(GET CMP0025 appleClangPolicy)
-if(WIN32 OR (APPLE AND NOT appleClangPolicy STREQUAL NEW))
+if(APPLE AND NOT appleClangPolicy STREQUAL NEW)
   return()
 endif()
 
@@ -49,7 +49,7 @@ macro(cmake_record_cxx_compile_features)
   endmacro()
 
   set(_result 0)
-  if (UNIX AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.4)
+  if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.4)
     _get_clang_features(${CMAKE_CXX14_STANDARD_COMPILE_OPTION} CMAKE_CXX14_COMPILE_FEATURES)
     if (_result EQUAL 0)
       _get_clang_features(${CMAKE_CXX11_STANDARD_COMPILE_OPTION} CMAKE_CXX11_COMPILE_FEATURES)

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

Summary of changes:
 Help/release/dev/mingw-clang-compile-features.rst |    5 +++++
 Modules/Compiler/Clang-CXX.cmake                  |    4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 Help/release/dev/mingw-clang-compile-features.rst


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list