From eb7044977e371535f42c8be41e7a499f4c957a38 Mon Sep 17 00:00:00 2001 From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com> Date: Mon, 6 May 2019 13:50:06 -0400 Subject: [PATCH] build unittests in c++17, not c++14 Remove the CMAKE_CXX_STANDARD override here. Also I got a bit lucky because will not compile in c++17 mode due to the removal of std::random_shuffle. However, we didn't need that include anyways at the moment since a bunch of stuff in that file is #if 0ed --- tests/CMakeLists.txt | 2 -- unittests/CMakeLists.txt | 2 -- unittests/producer_schedule_tests.cpp | 1 - 3 files changed, 5 deletions(-) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index ba87969bb80..7e770d7c24d 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -9,8 +9,6 @@ find_package(LLVM 4.0 REQUIRED CONFIG) link_directories(${LLVM_LIBRARY_DIR}) -set( CMAKE_CXX_STANDARD 14 ) - include_directories("${CMAKE_SOURCE_DIR}/plugins/wallet_plugin/include") file(GLOB UNIT_TESTS "*.cpp") diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt index b0a08280336..82e723e5563 100644 --- a/unittests/CMakeLists.txt +++ b/unittests/CMakeLists.txt @@ -33,8 +33,6 @@ find_package(LLVM 4.0 REQUIRED CONFIG) link_directories(${LLVM_LIBRARY_DIR}) -set( CMAKE_CXX_STANDARD 14 ) - add_subdirectory(contracts) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/contracts.hpp.in ${CMAKE_CURRENT_BINARY_DIR}/include/contracts.hpp ESCAPE_QUOTES) diff --git a/unittests/producer_schedule_tests.cpp b/unittests/producer_schedule_tests.cpp index 2a91f06a7c1..bec63376ff5 100644 --- a/unittests/producer_schedule_tests.cpp +++ b/unittests/producer_schedule_tests.cpp @@ -5,7 +5,6 @@ #include #include -#include #include #include "fork_test_utilities.hpp"