Skip to content

Update EKAT to require C++20 #400

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tcclevenger wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Update EKAT to require C++20 #400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
461b3d1
Set CMAKE_CXX_STANDARD to C++20
tcclevenger Dec 11, 2025
d7a1454
Remove c++ standard specifics from core/CMakeLists.txt
tcclevenger Dec 11, 2025
8244207
Remove cmake arg from cactus
tcclevenger Dec 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
cmake_minimum_required(VERSION 3.13)

if (NOT CMAKE_CXX_STANDARD)
set (CMAKE_CXX_STANDARD 20)
endif()

# EKAT requires C++20
if(CMAKE_CXX_STANDARD LESS 20)
message(FATAL_ERROR "EKAT requires C++20 or greater. Current value: ${CMAKE_CXX_STANDARD}")
endif()

set (EKAT_CMAKE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake CACHE INTERNAL "")

# Do not ignore <PackageName_ROOT> env vars in find_package() calls
Expand Down
1 change: 0 additions & 1 deletion cacts.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ configurations:
uses_baselines: False
on_by_default: True
cmake_args:
CMAKE_CXX_STANDARD: 20
EKAT_ENABLE_ALL_PACKAGES: True
EKAT_TEST_THREAD_INC: ${2 if machine.gpu_arch is None else 1}
EKAT_TEST_MAX_THREADS: ${machine.num_run_res if machine.gpu_arch is None else 1}
Expand Down
3 changes: 0 additions & 3 deletions src/core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,6 @@ add_library(ekat_core
ekat_test_utils.cpp
)

# EKAT requires c++17 features
target_compile_features(ekat_core PUBLIC cxx_std_17)

# Add the correct ekat::Comm impl file, depending on whether MPI is ON/OFF.
if (EKAT_ENABLE_MPI)
target_sources(ekat_core PRIVATE ekat_comm.cpp)
Expand Down