Relocate CXX standard setup

Need to process CXX standard after a potential CONFIGURE_OPTIONS_FILE has been processed. This manifested a small bug where the configure message about which CXX standard was being used showed 17 even though the entry in the Trilinos_CONFIGURE_OPTIONS_FILE read 20 (and in fact it did use 20).
trilinos · Oct 25, 2023 · b404624 · b404624
1 parent 3ff154a
commit b404624
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -96,9 +96,6 @@ SET(Trilinos_USE_GNUINSTALLDIRS_DEFAULT ON)
 
 SET(Trilinos_MUST_FIND_ALL_TPL_LIBS_DEFAULT TRUE)
 
-# Set up C++ language standard selection
-include(SetTrilinosCxxStandard)
-
 # Some CMake and TriBiTS tweaks just for Trilinos
 include(TrilinosTweaks)
 

diff --git a/cmake/CallbackSetupExtraOptions.cmake b/cmake/CallbackSetupExtraOptions.cmake
@@ -92,3 +92,6 @@ include("${Trilinos_SOURCE_DIR}/commonTools/build_stats/BuildStatsWrappers.cmake
 generate_build_stats_wrappers()
 remove_build_stats_file_on_configure()
 remove_build_stats_timing_files_on_fresh_configure()
+
+# Set up C++ language standard selection
+include(SetTrilinosCxxStandard)