mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-08 14:50:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Tests: use cxx_auto_type only if actually available

Browse Source 
The presence of CMAKE_CXX_COMPILE_FEATURES doesn't mean cxx_auto_type is always
available.
This commit is contained in:
Rolf Eike Beer
2017-01-25 21:00:30 +01:00
parent 014365ea97
commit ef47272b07
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Tests/CMakeCommands/target_compile_features/CMakeLists.txt
View File

@@ -26,7 +26,7 @@ if (CMAKE_C_COMPILE_FEATURES)
target_link_libraries(restrict_user lib_restrict)
endif()
if (CMAKE_CXX_COMPILE_FEATURES)
if (CMAKE_CXX_COMPILE_FEATURES AND ";${CMAKE_CXX_COMPILE_FEATURES};" MATCHES ";cxx_auto_type;")
if (CMAKE_C_COMPILE_FEATURES)
set(target_suffix _cxx)
endif()

3
Tests/CompileFeatures/CMakeLists.txt
View File

@@ -275,7 +275,10 @@ if (CMAKE_CXX_COMPILE_FEATURES)
)
endif()
endif()
endif ()
# these tests only work if at least cxx_auto_type is available
if (";${CMAKE_CXX_COMPILE_FEATURES};" MATCHES ";cxx_auto_type;")
add_executable(CompileFeatures main.cpp)
set_property(TARGET CompileFeatures
PROPERTY COMPILE_FEATURES "cxx_auto_type"