Skip to content

Commit

Permalink
Make work with missing commonTools/build_stats (trilinos#11976)
Browse files Browse the repository at this point in the history
This is also a TriBITS Trilinos package so if it is not enabled, then it gets
excluded.  I am not sure this is the right thing to do but for now, it fixes
the immediate problem reported in trilinos#11976.
  • Loading branch information
bartlettroscoe committed Jun 15, 2023
1 parent fba42ce commit 7c630d7
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 5 deletions.
4 changes: 3 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,9 @@ SET(${PROJECT_NAME}_ENABLE_EXPORT_MAKEFILES OFF CACHE BOOL
# Do all of the processing for this Tribits project
TRIBITS_PROJECT()

INSTALL_BUILD_STATS_SCRIPTS()
if (COMMAND INSTALL_BUILD_STATS_SCRIPTS)
INSTALL_BUILD_STATS_SCRIPTS()
endif()

# Install TriBITS so that other projects can use it.
ADVANCED_SET(${PROJECT_NAME}_INSTALL_TriBITS ON CACHE BOOL
Expand Down
13 changes: 9 additions & 4 deletions cmake/CallbackSetupExtraOptions.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,12 @@ ENDMACRO()
# Set up for build stats
#

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(buildStatsWrappersFile
"${Trilinos_SOURCE_DIR}/commonTools/build_stats/BuildStatsWrappers.cmake")
if (EXISTS "${buildStatsWrappersFile}")
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()
endif()

0 comments on commit 7c630d7

Please sign in to comment.