From ef47272b075a2ad8018481d3fdfb6f2beb514056 Mon Sep 17 00:00:00 2001 From: Rolf Eike Beer Date: Wed, 25 Jan 2017 21:00:30 +0100 Subject: Tests: use cxx_auto_type only if actually available The presence of CMAKE_CXX_COMPILE_FEATURES doesn't mean cxx_auto_type is always available. --- Tests/CMakeCommands/target_compile_features/CMakeLists.txt | 2 +- Tests/CompileFeatures/CMakeLists.txt | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Tests/CMakeCommands/target_compile_features/CMakeLists.txt b/Tests/CMakeCommands/target_compile_features/CMakeLists.txt index 9b35f27..555a08f 100644 --- a/Tests/CMakeCommands/target_compile_features/CMakeLists.txt +++ b/Tests/CMakeCommands/target_compile_features/CMakeLists.txt @@ -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() diff --git a/Tests/CompileFeatures/CMakeLists.txt b/Tests/CompileFeatures/CMakeLists.txt index 0405def..13aa86e 100644 --- a/Tests/CompileFeatures/CMakeLists.txt +++ b/Tests/CompileFeatures/CMakeLists.txt @@ -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" -- cgit v0.12