From 40fa6f98bf120b302c32be3fa15d7abbce4c96a7 Mon Sep 17 00:00:00 2001 From: Christoph Hertzberg Date: Fri, 19 Oct 2018 17:20:51 +0200 Subject: bug #1606: Explicitly set the standard before find_package(StandardMathLibrary). Also replace EIGEN_COMPILER_SUPPORT_CXX11 in favor of EIGEN_COMPILER_SUPPORT_CPP11. Grafted manually from a4afa90d161faab385a77f0e2764fb13ff3b9484 --- unsupported/test/CMakeLists.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'unsupported/test/CMakeLists.txt') diff --git a/unsupported/test/CMakeLists.txt b/unsupported/test/CMakeLists.txt index 875842272..cda658e0e 100644 --- a/unsupported/test/CMakeLists.txt +++ b/unsupported/test/CMakeLists.txt @@ -68,7 +68,7 @@ ei_add_test(EulerAngles) find_package(MPFR 2.3.0) find_package(GMP) -if(MPFR_FOUND AND EIGEN_COMPILER_SUPPORT_CXX11) +if(MPFR_FOUND AND EIGEN_COMPILER_SUPPORT_CPP11) include_directories(${MPFR_INCLUDES} ./mpreal) ei_add_property(EIGEN_TESTED_BACKENDS "MPFR C++, ") set(EIGEN_MPFR_TEST_LIBRARIES ${MPFR_LIBRARIES} ${GMP_LIBRARIES}) @@ -151,8 +151,9 @@ if(EIGEN_TEST_CXX11) else(EIGEN_SYCL_TRISYCL) # It should be safe to always run these tests as there is some fallback code for # older compiler that don't support cxx11. - set(CMAKE_CXX_STANDARD 11) - set(STD_CXX_FLAG "-std=c++11") + # This is already set if EIGEN_TEST_CXX11 is enabled: + # set(CMAKE_CXX_STANDARD 11) + # set(STD_CXX_FLAG "-std=c++11") endif(EIGEN_SYCL_TRISYCL) ei_add_test_sycl(cxx11_tensor_sycl ${STD_CXX_FLAG}) -- cgit v1.2.3