Commit 6a038623 authored by Praetorius, Simon's avatar Praetorius, Simon
Browse files

small correction in cmake files

parent 0ad0932f
...@@ -5,12 +5,14 @@ if (ENABLE_CXX11) ...@@ -5,12 +5,14 @@ if (ENABLE_CXX11)
if (${CMAKE_VERSION} VERSION_GREATER "3.0") if (${CMAKE_VERSION} VERSION_GREATER "3.0")
set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON) 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") if (NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel") # cmake can not detect intel compile features
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 cmake/dummy.cc)
foreach(feature ${REQUIRED_CXX_FEATURES}) add_library(test_compiler_features cmake/dummy.cc)
target_compile_features(test_compiler_features PUBLIC ${feature}) foreach(feature ${REQUIRED_CXX_FEATURES})
endforeach(feature) target_compile_features(test_compiler_features PUBLIC ${feature})
endforeach(feature)
endif ()
else() else()
if (CMAKE_COMPILER_IS_GNUCXX) if (CMAKE_COMPILER_IS_GNUCXX)
set(GXX_MIN_VER "4.8") set(GXX_MIN_VER "4.8")
......
...@@ -72,7 +72,7 @@ if (ENABLE_PARALLEL_DOMAIN) ...@@ -72,7 +72,7 @@ if (ENABLE_PARALLEL_DOMAIN)
${SOURCE_DIR}/parallel/ZoltanPartitioner.cc) ${SOURCE_DIR}/parallel/ZoltanPartitioner.cc)
if(ENABLE_PARALLEL_DOMAIN STREQUAL "PETSC") if(ENABLE_PARALLEL_DOMAIN STREQUAL "PETSC")
set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};/usr/share/cmake-2.8/Modules/;${CMAKE_SOURCE_DIR}/") set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};/usr/share/cmake-2.8/Modules/;${AMDIS_SOURCE_DIR}/cmake")
set(PETSC_EXECUTABLE_RUNS ON) set(PETSC_EXECUTABLE_RUNS ON)
find_package(PETSc REQUIRED) find_package(PETSc REQUIRED)
include_directories(${PETSC_DIR}/include ${PETSC_DIR}/${PETSC_ARCH}/include) include_directories(${PETSC_DIR}/include ${PETSC_DIR}/${PETSC_ARCH}/include)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment