diff options
| author | Brad King <brad.king@kitware.com> | 2016-01-12 15:23:05 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-01-12 15:23:05 (GMT) |
| commit | 6262fb2f4e10995026710802b213bdd307e0d7b8 (patch) | |
| tree | 8ca700fdd67d2e28d223a69d476bb0c0165a1147 | |
| parent | 31a58b438f1d597d10835db30edeb1283a4d4829 (diff) | |
| parent | 3baca6364bb1569e6856337d80e54b37a96d017e (diff) | |
| download | CMake-6262fb2f4e10995026710802b213bdd307e0d7b8.zip CMake-6262fb2f4e10995026710802b213bdd307e0d7b8.tar.gz CMake-6262fb2f4e10995026710802b213bdd307e0d7b8.tar.bz2 | |
Merge topic 'mingw-clang-compile-features'
3baca636 Record compile features for MinGW Clang on Windows (#15897)
| -rw-r--r-- | Help/release/dev/mingw-clang-compile-features.rst | 5 | ||||
| -rw-r--r-- | Modules/Compiler/Clang-CXX.cmake | 4 |
2 files changed, 7 insertions, 2 deletions
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) |