From 61c340e344289084e0d796c73fd5cccf8fa4300a Mon Sep 17 00:00:00 2001 From: bennibbelink <79653949+bennibbelink@users.noreply.github.com> Date: Sat, 20 Apr 2024 15:51:54 -0500 Subject: [PATCH 1/2] require C++17 standard --- CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 020368720..6f17b6854 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,11 +15,11 @@ PROJECT(CYCAMORE VERSION 1.5.5) # check for and enable c++11 support (required for cyclus) INCLUDE(CheckCXXCompilerFlag) -CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11) -IF(COMPILER_SUPPORTS_CXX11) - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") +CHECK_CXX_COMPILER_FLAG("-std=c++17" COMPILER_SUPPORTS_CXX17) +IF(COMPILER_SUPPORTS_CXX17) + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17") ELSE() - MESSAGE(STATUS "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler.") + MESSAGE(STATUS "The compiler ${CMAKE_CXX_COMPILER} has no C++17 support. Please use a different C++ compiler.") ENDIF() # quiets fortify_source warnings when not compiling with optimizations From 932b69d4408fcc44f26de0ba138b103c48f59aac Mon Sep 17 00:00:00 2001 From: bennibbelink <79653949+bennibbelink@users.noreply.github.com> Date: Sat, 20 Apr 2024 15:54:32 -0500 Subject: [PATCH 2/2] update CHANGELOG --- CHANGELOG.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index fe1c02c81..0fad68724 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -14,7 +14,7 @@ cycamore Change Log **Changed:** -* Updated build procedure to use newer versions of packages in 2023 (#549, #596) +* Updated build procedure to use newer versions of packages and compilers in 2023 (#549, #596, #599) * Added active/dormant and request size variation from buy policy to Storage (#546, #568, #586, #587) * Update build procedure to force a rebuild when a test file is changed (#584) * Define the version number in `CMakeLists.txt` and rely on CMake to propagate the version throughout the code (#589)