Merge pull request #18367 from GordonSmith/HPCC-31383-CXX17

HPCC-31383 Set CXX 17 for all targets Reviewed-by: Gavin Halliday <[email protected]> Merged-by: Gavin Halliday <[email protected]>
hpcc-systems · Mar 6, 2024 · 508af59 · 508af59
2 parents fa10968 + 0f7829a
commit 508af59
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/cmake_modules/commonSetup.cmake b/cmake_modules/commonSetup.cmake
@@ -25,6 +25,8 @@
 IF ("${COMMONSETUP_DONE}" STREQUAL "")
   SET (COMMONSETUP_DONE 1)
 
+  set(CMAKE_CXX_STANDARD 17)
+
   MACRO (MACRO_ENSURE_OUT_OF_SOURCE_BUILD _errorMessage)
     STRING(COMPARE EQUAL "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" insource)
     IF (insource)
@@ -332,7 +334,6 @@ IF ("${COMMONSETUP_DONE}" STREQUAL "")
       endif ()
       SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELEASE}")
       SET (CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELEASE}")
-      set(CMAKE_CXX_STANDARD 17)
       if (GENERATE_COVERAGE_INFO)
         message ("Build system with coverage.")
         if (CMAKE_COMPILER_IS_CLANGXX)