diff options
| author | Brad King <brad.king@kitware.com> | 2016-01-11 15:08:01 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-01-11 15:13:18 (GMT) |
| commit | 3baca6364bb1569e6856337d80e54b37a96d017e (patch) | |
| tree | b4dbbca5531866c7f4841feae50f6c29c085cd51 /Modules | |
| parent | cedbb7994dddce2c3fdf846bf4563c846adf4632 (diff) | |
| download | CMake-3baca6364bb1569e6856337d80e54b37a96d017e.zip CMake-3baca6364bb1569e6856337d80e54b37a96d017e.tar.gz CMake-3baca6364bb1569e6856337d80e54b37a96d017e.tar.bz2 | |
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.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/Compiler/Clang-CXX.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
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) |