From 126dc349012cdd14815df187bf2f6b9ee72a6df4 Mon Sep 17 00:00:00 2001 From: Lukas Steiner Date: Tue, 24 May 2022 15:54:10 +0200 Subject: [PATCH] Fix cmake error when building the library, add C++17 flags to all cmake files. --- DRAMSys/gem5/CMakeLists.txt | 2 +- DRAMSys/library/CMakeLists.txt | 2 +- DRAMSys/library/src/common/configuration/CMakeLists.txt | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/DRAMSys/gem5/CMakeLists.txt b/DRAMSys/gem5/CMakeLists.txt index 0fc32601..527055c2 100644 --- a/DRAMSys/gem5/CMakeLists.txt +++ b/DRAMSys/gem5/CMakeLists.txt @@ -37,7 +37,7 @@ set(GEM5_VARIANT opt) # opt, fast set(GEM5_ISA ARM) # ARM, X86 # Configuration: -set(CMAKE_CXX_STANDARD 11 CACHE STRING "C++ Version") +set(CMAKE_CXX_STANDARD 17 CACHE STRING "C++ Version") set(DCMAKE_SH="CMAKE_SH-NOTFOUND") find_library(GEM5_LIBRARY gem5_${GEM5_VARIANT} PATHS $ENV{GEM5}/build/${GEM5_ISA}/) diff --git a/DRAMSys/library/CMakeLists.txt b/DRAMSys/library/CMakeLists.txt index ca779298..3b8eace5 100644 --- a/DRAMSys/library/CMakeLists.txt +++ b/DRAMSys/library/CMakeLists.txt @@ -39,7 +39,7 @@ cmake_minimum_required(VERSION 3.10) project(DRAMSysLibrary) # Configuration: -set(CMAKE_CXX_STANDARD 11 CACHE STRING "C++ Version") +set(CMAKE_CXX_STANDARD 17 CACHE STRING "C++ Version") set(DCMAKE_SH="CMAKE_SH-NOTFOUND") # Add DRAMPower: diff --git a/DRAMSys/library/src/common/configuration/CMakeLists.txt b/DRAMSys/library/src/common/configuration/CMakeLists.txt index 92a23505..4b8f7fa6 100644 --- a/DRAMSys/library/src/common/configuration/CMakeLists.txt +++ b/DRAMSys/library/src/common/configuration/CMakeLists.txt @@ -33,12 +33,12 @@ set(JSON_BuildTests OFF CACHE INTERNAL "") set(JSON_ImplicitConversions OFF CACHE INTERNAL "") -add_subdirectory(${CMAKE_SOURCE_DIR}/library/src/common/third_party/nlohmann ${CMAKE_CURRENT_BINARY_DIR}/nlohmann) +add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/../third_party/nlohmann ${CMAKE_CURRENT_BINARY_DIR}/nlohmann) option(DRAMSYS_CONFIGURATION_TESTS "Build the unit tests for configuration." OFF) if (DRAMSYS_CONFIGURATION_TESTS) - add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/tests) + add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/tests) endif() add_library(DRAMSysConfiguration STATIC @@ -55,8 +55,8 @@ add_library(DRAMSysConfiguration STATIC util.cpp ) -target_compile_definitions(DRAMSysConfiguration PUBLIC DRAMSysResourceDirectory="${CMAKE_SOURCE_DIR}/library/resources") +target_compile_definitions(DRAMSysConfiguration PUBLIC DRAMSysResourceDirectory="${CMAKE_CURRENT_LIST_DIR}/../../../resources") -target_include_directories(DRAMSysConfiguration PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) +target_include_directories(DRAMSysConfiguration PUBLIC ${CMAKE_CURRENT_LIST_DIR}) target_link_libraries(DRAMSysConfiguration PUBLIC nlohmann_json::nlohmann_json)