Merge pull request #44 from KSkwarczynski/feature_cmakeFix

Use MaCh3 cxx standard
DUNE · Feb 4, 2025 · ef9fa5a · ef9fa5a
2 parents a538af4 + e12fd58
commit ef9fa5a
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -169,12 +169,11 @@ if(NOT TARGET MaCh3::All)
 endif()
 
 ############################  C++ Compiler  ####################################
-if (NOT DEFINED CMAKE_CXX_STANDARD OR "${CMAKE_CXX_STANDARD} " STREQUAL " ")
+get_property(MACH3_CXX_STANDARD GLOBAL PROPERTY MACH3_CXX_STANDARD)
+if(NOT DEFINED MACH3_CXX_STANDARD)
   SET(CMAKE_CXX_STANDARD 14)
-endif()
-
-if(DEFINED ROOT_CXX_STANDARD AND ROOT_CXX_STANDARD GREATER CMAKE_CXX_STANDARD)
-  set(CMAKE_CXX_STANDARD ${ROOT_CXX_STANDARD})
+else()
+  SET(CMAKE_CXX_STANDARD ${MACH3_CXX_STANDARD})
 endif()
 cmessage(STATUS "CMAKE CXX Standard: ${CMAKE_CXX_STANDARD}")