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

Fix reduced tarball configuration (#11976) #11977

Merged
merged 2 commits into from
Jun 16, 2023
Merged

Fix reduced tarball configuration (#11976) #11977

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c630d7
Make work with missing commonTools/build_stats (#11976)
bartlettroscoe Jun 15, 2023
40e37d9
TriBITS: Temp fix for configuring from reduced tarball (#11976)
bartlettroscoe Jun 15, 2023
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
4 changes: 3 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
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
View file
Open in desktop
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()

14 changes: 12 additions & 2 deletions cmake/tribits/core/package_arch/TribitsReadDepsFilesCreateDepsGraph.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,8 +182,18 @@ macro(tribits_read_all_package_deps_files_create_deps_graph)
set(${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES "") # Packages and subpackages

foreach(TRIBITS_PACKAGE IN LISTS ${PROJECT_NAME}_DEFINED_INTERNAL_TOPLEVEL_PACKAGES)
tribits_read_toplevel_package_deps_files_add_to_graph(${TRIBITS_PACKAGE}
${${TRIBITS_PACKAGE}_REL_SOURCE_DIR})
set(absPackageSrcDir "${PROJECT_SOURCE_DIR}/${${TRIBITS_PACKAGE}_REL_SOURCE_DIR}")
set(packageDependenciesFile "${absPackageSrcDir}/cmake/Dependencies.cmake")
if ( (NOT EXISTS "${packageDependenciesFile}")
AND (NOT ${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES IN_LIST
${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES_ERROR_VALUES_LIST)
)
# ToDo: Print message about the package being missing depending on the
# value of ${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES!
else()
message("${TRIBITS_PACKAGE} package dependency file: '${packageDependenciesFile}' exists!")
tribits_read_toplevel_package_deps_files_add_to_graph(${TRIBITS_PACKAGE})
endif()
endforeach()

list(LENGTH ${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES
Expand Down