From 040874224bff7d61a09cbdb22fa318cbaf05afd7 Mon Sep 17 00:00:00 2001 From: Bailey Chittle <39804642+bachittle@users.noreply.github.com> Date: Tue, 21 Mar 2023 14:23:14 -0400 Subject: [PATCH] setting the cmake standard to 20 when using std format (#2680) --- CMakeLists.txt | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3389c04b..3830dfe2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,7 +25,10 @@ endif() # --------------------------------------------------------------------------------------- # Compiler config # --------------------------------------------------------------------------------------- -if(NOT CMAKE_CXX_STANDARD) +if(SPDLOG_USE_STD_FORMAT) + set(CMAKE_CXX_STANDARD 20) + set(CMAKE_CXX_STANDARD_REQUIRED ON) +elseif(NOT CMAKE_CXX_STANDARD) set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD_REQUIRED ON) endif() @@ -256,11 +259,6 @@ if(SPDLOG_NO_EXCEPTIONS AND NOT MSVC) target_compile_options(spdlog PRIVATE -fno-exceptions) endif() -if(SPDLOG_USE_STD_FORMAT) - set(CMAKE_CXX_STANDARD 20) - set(CMAKE_CXX_STANDARD_REQUIRED ON) -endif() - # --------------------------------------------------------------------------------------- # Build binaries # ---------------------------------------------------------------------------------------