Commit 4a63ab6a authored by MARAIT Gilles's avatar MARAIT Gilles
Browse files

Still trying to fix compilation for Intel 17.0

parent 7554e517
......@@ -70,28 +70,36 @@ target_compile_definitions(fabulous_cpp INTERFACE
LAPACK_COMPLEX_CPP
)
# dependency on CBLAS/LAPACKE purposely not added here
set(CMAKE_CXX_EXTENTIONS OFF)
target_compile_features(fabulous_cpp INTERFACE
cxx_auto_type
cxx_return_type_deduction
cxx_decltype_auto
cxx_variadic_macros
cxx_override
cxx_final
cxx_lambdas
cxx_delegating_constructors
cxx_inheriting_constructors
cxx_deleted_functions
cxx_static_assert
cxx_nullptr
cxx_range_for
)
if (CMAKE_CXX_COMPILER_ID MATCHES "Intel*")
# some old version of cmake do not know about ICC/ICPC features
target_compile_options(fabulous_cpp INTERFACE
$<$<COMPILE_LANGUAGE:CXX>:-std=c++14>
)
endif()
# Commented because Intel 17.0 did not support this stuff
#target_compile_features(fabulous_cpp INTERFACE
# cxx_auto_type
# cxx_return_type_deduction
# cxx_decltype_auto
# cxx_variadic_macros
# cxx_override
# cxx_final
# cxx_lambdas
# cxx_delegating_constructors
# cxx_inheriting_constructors
# cxx_deleted_functions
# cxx_static_assert
# cxx_nullptr
# cxx_range_for
# )
#if (CMAKE_CXX_COMPILER_ID MATCHES "Intel*")
# # some old version of cmake do not know about ICC/ICPC features
# target_compile_options(fabulous_cpp INTERFACE
# $<$<COMPILE_LANGUAGE:CXX>:-std=c++14>
# )
#endif()
target_compile_options(fabulous_cpp INTERFACE
$<$<COMPILE_LANGUAGE:CXX>:-std=c++14>
)
if(FABULOUS_BUILD_C_API OR FABULOUS_BUILD_EXAMPLES OR FABULOUS_BUILD_TESTS)
enable_testing()
......
Supports Markdown
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