compiler-feature test modified

12d3dc5c · Praetorius, Simon · 7e699189 · 12d3dc5c · 12d3dc5c · 12d3dc5c
Commit 12d3dc5c authored Feb 18, 2016 by Praetorius, Simon
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 7 deletions

AMDiS/CMakeLists.txt AMDiS/CMakeLists.txt +0 -7

AMDiS/cmake/dummy.cc AMDiS/cmake/dummy.cc +0 -0

AMDiS/cmake/enable_cxx11.cmake AMDiS/cmake/enable_cxx11.cmake +5 -0

No files found.
--- a/AMDiS/CMakeLists.txt
+++ b/AMDiS/CMakeLists.txt
@@ -268,13 +268,6 @@ else()
 endif()


-if (${CMAKE_VERSION} VERSION_GREATER "3.0")
-  foreach(feature in ${REQUIRED_CXX_FEATURES})
-    target_compile_features(amdis INTERFACE feature)
-    target_compile_features(muparser INTERFACE feature)
-  endforeach(feature)
-endif ()
-
 list(APPEND AMDIS_LIBS amdis ${Boost_LIBRARIES})

 # some special treatements for Windows systems

--- a/AMDiS/cmake/dummy.cc
+++ b/AMDiS/cmake/dummy.cc
--- a/AMDiS/cmake/enable_cxx11.cmake
+++ b/AMDiS/cmake/enable_cxx11.cmake
@@ -6,6 +6,11 @@ if (ENABLE_CXX11)
        set(CMAKE_CXX_STANDARD 11)
        set(CMAKE_CXX_STANDARD_REQUIRED ON)
        set(REQUIRED_CXX_FEATURES "cxx_alias_templates" "cxx_auto_type" "cxx_lambdas" "cxx_override" "cxx_range_for" "cxx_static_assert" "cxx_variadic_templates")
+	
+	add_library(test_compiler_features dummy.cc)
+	foreach(feature ${REQUIRED_CXX_FEATURES})
+	    target_compile_features(test_compiler_features PUBLIC ${feature})
+        endforeach(feature)
    else()
        if (CMAKE_COMPILER_IS_GNUCXX)
            set(GXX_MIN_VER "4.8")