From b404624901c14b1b4119c9ebcb894cb7e822f76e Mon Sep 17 00:00:00 2001 From: Samuel Browne Date: Wed, 25 Oct 2023 08:11:30 -0600 Subject: [PATCH] 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). --- CMakeLists.txt | 3 --- cmake/CallbackSetupExtraOptions.cmake | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 62d72a30e989..a10c659306ee 100644 --- 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 index 445faffd6438..43850d7b6223 100644 --- 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)