From 027d4b49e85483243628307c8742169715fc6b19 Mon Sep 17 00:00:00 2001 From: vincent samy Date: Mon, 30 Mar 2020 18:11:30 +0900 Subject: [PATCH] c++17 needed for MSVC. Test on MSVC 16.5.1. --- CMakeLists.txt | 2 +- tests/CMakeLists.txt | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9a461ad..7d304f8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,7 +35,7 @@ SET(PROJECT_DEBUG_POSTFIX "_d") set(INSTALL_GENERATED_HEADERS OFF) set(DOXYGEN_USE_MATHJAX "NO") -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) option(BUILD_TESTING "Disable unit tests." ON) option(BUILD_TEST_STATIC_BOOST "Build unit tests with static boost libraries" OFF) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 77cffd1..5825633 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -31,6 +31,9 @@ find_package(Catch2 REQUIRED) macro(addTest testName) add_executable(${testName} ${testName}.cpp) + if (MSVC) + target_compile_definitions(${testName} PUBLIC _SILENCE_ALL_CXX17_DEPRECATION_WARNINGS) + endif() target_link_libraries(${testName} PRIVATE Catch2::Catch2) target_compile_definitions(${testName} PRIVATE CATCH_CONFIG_MAIN) target_include_directories(${testName} SYSTEM PRIVATE "${EIGEN3_INCLUDE_DIR}")