From 3baca6364bb1569e6856337d80e54b37a96d017e Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 11 Jan 2016 10:08:01 -0500 Subject: [PATCH] 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. --- 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 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 000000000..5b1fb9642 --- /dev/null +++ b/Help/release/dev/mingw-clang-compile-features.rst @@ -0,0 +1,5 @@ +mingw-clang-compile-features +---------------------------- + +* The :manual:`Compile Features ` 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 6a0a5e2ff..dc6271198 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)