Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Framework: Relocate CXX standard setup #12442

Merged
merged 1 commit into from
Oct 26, 2023
+3 −3
Merged

Framework: Relocate CXX standard setup #12442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
3 changes: 3 additions & 0 deletions cmake/CallbackSetupExtraOptions.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Comment on lines +96 to +97
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should do it but I am not sure why stuff got placed outside of the macro TRIBITS_REPOSITORY_SETUP_EXTRA_OPTIONS() that gets defined in this file and called by TriBITS. Semantically, there is not a big difference in behavior except that this code outside of the macro TRIBITS_REPOSITORY_SETUP_EXTRA_OPTIONS() in that file actually gets called before the code inside of the macro as you can see in:

Trilinos/cmake/tribits/core/package_arch/TribitsPackagingSupport.cmake

Lines 312 to 314 in 3ff154a

include(${CALLBACK_SETUP_EXTRA_OPTIONS_FILE})
# Call the callback macros to inject repository-specific behavir
tribits_repository_setup_extra_options()

But I see that I was the one who set the precedent for this by adding the build_stats stuff there in commit 3ea9417 with no explanation for why that was done.

SIDENOTE: I don't remember why I decided to put things in a macro in these files because just including CMake code in a file is largely equivalent to calling a macro.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll do whichever you think is best. I noticed that too, but decided to put it in (IMO) the simpler spot

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can do this in a separate PR now that PR testing has already started.