Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
cmake_minimum_required(VERSION 3.18)

# EKAT requires C++20
set(CMAKE_CXX_STANDARD 20)

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
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: 2 additions & 1 deletion cmake/tpls/EkatBuildSpdlog.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ include (EkatUtils)

message (STATUS " Fetching spdlog via FetchContent")

set (SPDLOG_GIT_TAG bdd1dff3788ebfe520f48f9ad216c60da6dd8f00)
# spdlog version 1.17.0 commit sha
set (SPDLOG_GIT_TAG 79524ddd08a4ec981b7fea76afd08ee05f83755d)
Comment thread
tcclevenger marked this conversation as resolved.

# We don't want testing or any spdlog executable at all
option (SPDLOG_BUILD_TESTS "Enable spdlog tests" OFF)
Expand Down
3 changes: 0 additions & 3 deletions src/core/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,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
Loading