diff options
| author | Brad King <brad.king@kitware.com> | 2015-03-20 13:47:35 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-03-20 13:47:35 (GMT) |
| commit | 1b1144b91dcaae05a0caffd3d238e76268600af7 (patch) | |
| tree | 8fbd82a3158de068adf9208168e208357a0f7bab | |
| parent | a066f73263c8c56f968324e51daee717291b3908 (diff) | |
| parent | 2aaf4f60810a86d62927a915e9286e4c2be9c53a (diff) | |
| download | CMake-1b1144b91dcaae05a0caffd3d238e76268600af7.zip CMake-1b1144b91dcaae05a0caffd3d238e76268600af7.tar.gz CMake-1b1144b91dcaae05a0caffd3d238e76268600af7.tar.bz2 | |
Merge topic 'mingw-compile-features'
2aaf4f60 Help: Add notes for topic 'mingw-compile-features'
f94727a9 Record compile features for GNU on Windows (#15443)
| -rw-r--r-- | Help/release/dev/mingw-compile-features.rst | 6 | ||||
| -rw-r--r-- | Modules/Compiler/GNU-CXX.cmake | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/Help/release/dev/mingw-compile-features.rst b/Help/release/dev/mingw-compile-features.rst new file mode 100644 index 0000000..e2ed30b --- /dev/null +++ b/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. diff --git a/Modules/Compiler/GNU-CXX.cmake b/Modules/Compiler/GNU-CXX.cmake index 86a31e4..2dc02f0 100644 --- a/Modules/Compiler/GNU-CXX.cmake +++ b/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() |