Explorar o código

Merge topic 'mingw-compile-features'

2aaf4f60 Help: Add notes for topic 'mingw-compile-features'
f94727a9 Record compile features for GNU on Windows (#15443)
Brad King %!s(int64=11) %!d(string=hai) anos
pai
achega
1b1144b91d

+ 6 - 0
Help/release/dev/mingw-compile-features.rst

@@ -0,0 +1,6 @@
+mingw-compile-features
+----------------------
+
+* The :manual:`Compile Features <cmake-compile-features(7)>` functionality
+  is now aware of features supported by GNU compilers on Windows, versions
+  4.4 through 5.0.

+ 2 - 2
Modules/Compiler/GNU-CXX.cmake

@@ -44,10 +44,10 @@ macro(cmake_record_cxx_compile_features)
   endmacro()
 
   set(_result 0)
-  if (UNIX AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8)
+  if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8)
     _get_gcc_features(${CMAKE_CXX14_STANDARD_COMPILE_OPTION} CMAKE_CXX14_COMPILE_FEATURES)
   endif()
-  if (UNIX AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.4)
+  if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.4)
     if (_result EQUAL 0)
       _get_gcc_features(${CMAKE_CXX11_STANDARD_COMPILE_OPTION} CMAKE_CXX11_COMPILE_FEATURES)
     endif()