Skip to content

Commit

Permalink
Don't require ${PROJECT_NAME}_TRIBITS_DIR for includes of utils files (
Browse files Browse the repository at this point in the history
…trilinos/Trilinos#4796)

Changing MessageWrapper.cmake to require ${PROJECT_NAME}_TRIBITS_DIR broke the
deprecated TriBITS Dashboard Driver system (which was created by a contactor)
which is still being used for some Trilinos builds and CASL VERA builds.  That
system is not under any automated testing so it is easy to break and hard to
test if it is working.

I changed back to simple include(file) and set CMAKE_MODULE_PATH in
tribits_get_version_date.cmake.

This passes the existing TriBITS tests for tribits_get_version_date.cmake.

I did not manually test the deprecated TriBITS Dashboard Driver system but
there is an about 99.9% chance this will fix it and therefore fix
trilinos/Trilinos#4796.

Build/Test Cases Summary
Enabled Packages:
Enabled all Packages
0) MPI_DEBUG => passed: passed=352,notpassed=0 (1.36 min)
1) SERIAL_RELEASE => passed: passed=352,notpassed=0 (0.89 min)
  • Loading branch information
bartlettroscoe committed Apr 11, 2019
1 parent 7389a43 commit e155f5d
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
7 changes: 6 additions & 1 deletion tribits/core/package_arch/tribits_get_version_date.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,12 @@ endif()
# B) Include modules

set(${PROJECT_NAME}_TRIBITS_DIR "${CMAKE_CURRENT_LIST_DIR}/../..")
include("${${PROJECT_NAME}_TRIBITS_DIR}/core/package_arch/TribitsGetVersionDate.cmake")
SET(CMAKE_MODULE_PATH
${${PROJECT_NAME}_TRIBITS_DIR}/core/utils
${${PROJECT_NAME}_TRIBITS_DIR}/core/package_arch
)

include(TribitsGetVersionDate)

# C) Find Git

Expand Down
2 changes: 1 addition & 1 deletion tribits/core/utils/MessageWrapper.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ IF (MESSAGE_WRAPPER_INCLUDED)
ENDIF()
SET(MESSAGE_WRAPPER_INCLUDED TRUE)

INCLUDE("${${PROJECT_NAME}_TRIBITS_DIR}/core/utils/GlobalSet.cmake")
INCLUDE(GlobalSet)

#
# @FUNCTION: MESSAGE_WRAPPER()
Expand Down

0 comments on commit e155f5d

Please sign in to comment.