kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'mingw-clang-compile-features' 

3baca636 Record compile features for MinGW Clang on Windows (#15897)
This commit is contained in:
Brad King 2016-01-12 10:23:05 -05:00 committed by CMake Topic Stage
parent 31a58b438f 3baca6364b
commit 6262fb2f4e
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Help/release/dev/mingw-clang-compile-features.rst Normal file
View File

@ -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).

4
Modules/Compiler/Clang-CXX.cmake
View File

@ -6,7 +6,7 @@ if(NOT "x${CMAKE_CXX_SIMULATE_ID}" STREQUAL "xMSVC")
endif() endif()
cmake_policy(GET CMP0025 appleClangPolicy) cmake_policy(GET CMP0025 appleClangPolicy)
if(WIN32 OR (APPLE AND NOT appleClangPolicy STREQUAL NEW)) if(APPLE AND NOT appleClangPolicy STREQUAL NEW)
return() return()
endif() endif()
@ -49,7 +49,7 @@ macro(cmake_record_cxx_compile_features)
endmacro() endmacro()
set(_result 0) 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) _get_clang_features(${CMAKE_CXX14_STANDARD_COMPILE_OPTION} CMAKE_CXX14_COMPILE_FEATURES)
if (_result EQUAL 0) if (_result EQUAL 0)
_get_clang_features(${CMAKE_CXX11_STANDARD_COMPILE_OPTION} CMAKE_CXX11_COMPILE_FEATURES) _get_clang_features(${CMAKE_CXX11_STANDARD_COMPILE_OPTION} CMAKE_CXX11_COMPILE_FEATURES)