From f7f6ed3495f34f94560beff002948fa10d306ca5 Mon Sep 17 00:00:00 2001
From: "Roscoe A. Bartlett" <rabartl@sandia.gov>
Date: Wed, 20 Jul 2022 13:10:37 -0600
Subject: [PATCH] Automatic snapshot commit from tribits at 5d4696b2

Origin repo remote tracking branch: 'github/master'
Origin repo remote repo URL: 'github = git@github.com:TriBITSPub/TriBITS.git'
Git describe: Vera4.0-RC1-start-1215-gb394d8ed

At commit:

commit 5d4696b2e4ce5e81d91c06638a44b358b2c5027b
Author:  Roscoe A. Bartlett <rabartl@sandia.gov>
Date:    Wed Jul 20 11:44:55 2022 -0600
Summary: Fix <tplName>Config.cmake files to not point into build dir (#500)
---
 cmake/tribits/CHANGELOG.md                                | 8 ++++++++
 .../TribitsExternalPackageWriteConfigFile.cmake           | 2 +-
 .../core/package_arch/TribitsProcessTplsLists.cmake       | 2 +-
 cmake/tribits/ctest_driver/README                         | 8 ++++----
 .../ctest_driver/TribitsGetCDashUrlsInsideCTestS.cmake    | 2 +-
 cmake/tribits/examples/MixedSharedStaticLibs/README       | 2 +-
 6 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/cmake/tribits/CHANGELOG.md b/cmake/tribits/CHANGELOG.md
index 20ca6f378e41..74dddeea4bb1 100644
--- a/cmake/tribits/CHANGELOG.md
+++ b/cmake/tribits/CHANGELOG.md
@@ -2,6 +2,14 @@
 ChangeLog for TriBITS
 ----------------------------------------
 
+## 2022-07-20:
+
+* ** Changed:** Fixed TriBITS generated and installed `<tplName>Config.cmake`
+  files to not point into the build dir but instead point into relative dir
+  for upstream TPL's when calling find_dependency() (see
+  [TribitsPub/TriBITS#500](https://github.com/TriBITSPub/TriBITS/issues/500)).
+  This also makes these files relocatable.
+
 ## 2022-07-14:
 
 * **Added:** Added support for `FindTPL<tplName>Dependencies.cmake` with new
diff --git a/cmake/tribits/core/package_arch/TribitsExternalPackageWriteConfigFile.cmake b/cmake/tribits/core/package_arch/TribitsExternalPackageWriteConfigFile.cmake
index 43c740484634..ebe45e29be1f 100644
--- a/cmake/tribits/core/package_arch/TribitsExternalPackageWriteConfigFile.cmake
+++ b/cmake/tribits/core/package_arch/TribitsExternalPackageWriteConfigFile.cmake
@@ -333,7 +333,7 @@ function(tribits_extpkg_add_find_upstream_dependencies_str
         message(FATAL_ERROR "ERROR: ${upstreamTplDepName}_DIR is empty!")
       endif()
       string(APPEND configFileFragStr
-        "set(${upstreamTplDepName}_DIR \"${${upstreamTplDepName}_DIR}\")\n"
+        "set(${upstreamTplDepName}_DIR \"\${CMAKE_CURRENT_LIST_DIR}/../${upstreamTplDepName}\")\n"
         "find_dependency(${upstreamTplDepName} REQUIRED CONFIG \${${tplName}_SearchNoOtherPathsArgs})\n"
 	"unset(${upstreamTplDepName}_DIR)\n"
 	"\n"
diff --git a/cmake/tribits/core/package_arch/TribitsProcessTplsLists.cmake b/cmake/tribits/core/package_arch/TribitsProcessTplsLists.cmake
index f4a66094b82c..843415c79e14 100644
--- a/cmake/tribits/core/package_arch/TribitsProcessTplsLists.cmake
+++ b/cmake/tribits/core/package_arch/TribitsProcessTplsLists.cmake
@@ -219,7 +219,7 @@ macro(tribits_process_tpls_lists  REPOSITORY_NAME  REPOSITORY_DIR)
 
       # Set ${TPL_NAME}_PACKAGE_BUILD_STATUS
 
-      SET(${TPL_NAME}_PACKAGE_BUILD_STATUS EXTERNAL)
+      set(${TPL_NAME}_PACKAGE_BUILD_STATUS EXTERNAL)
 
       # Set ${TPL_NAME}_TESTGROUP
 
diff --git a/cmake/tribits/ctest_driver/README b/cmake/tribits/ctest_driver/README
index 46ed1792d27c..af0c95117222 100644
--- a/cmake/tribits/ctest_driver/README
+++ b/cmake/tribits/ctest_driver/README
@@ -46,23 +46,23 @@ s903186):
 
   # Initially:
   #
-  TRIBITS_DRIVER_SETUP()
+  tribits_driver_setup()
 
   # Make one of these calls for each script
   #
-  TRIBITS_DRIVER_ADD_DASHBOARD(
+  tribits_driver_add_dashboard(
     MPI_OPT
     ctest_mac_nightly_mpi_opt_s903186.cmake
   )
 
-  TRIBITS_DRIVER_ADD_DASHBOARD(
+  tribits_driver_add_dashboard(
     SERIAL_DEBUG
     ctest_mac_nightly_serial_debug_s903186.cmake
   )
 
   # Finally:
   #
-  TRIBITS_ADD_REQUIRED_CMAKE_INSTALLS()
+  tribits_add_required_cmake_installs()
 
 The first argument to TRIBITS_DRIVER_ADD_DASHBOARD calls is the test
 name as it will appear on the <Project>Driver dashboard. The second
diff --git a/cmake/tribits/ctest_driver/TribitsGetCDashUrlsInsideCTestS.cmake b/cmake/tribits/ctest_driver/TribitsGetCDashUrlsInsideCTestS.cmake
index c6904f1195c9..3b456f868b91 100644
--- a/cmake/tribits/ctest_driver/TribitsGetCDashUrlsInsideCTestS.cmake
+++ b/cmake/tribits/ctest_driver/TribitsGetCDashUrlsInsideCTestS.cmake
@@ -428,7 +428,7 @@ function(tribits_get_cdash_index_php_from_drop_site_and_location)
     CTEST_DROP_SITE  ${PREFIX_CTEST_DROP_SITE}
     CTEST_DROP_LOCATION  ${PREFIX_CTEST_DROP_LOCATION}
     CDASH_SITE_URL_OUT  cdashSiteUrl )
-  SET(${PREFIX_INDEX_PHP_URL_OUT} "${cdashSiteUrl}/index.php" PARENT_SCOPE)
+  set(${PREFIX_INDEX_PHP_URL_OUT} "${cdashSiteUrl}/index.php" PARENT_SCOPE)
 endfunction()
 
 
diff --git a/cmake/tribits/examples/MixedSharedStaticLibs/README b/cmake/tribits/examples/MixedSharedStaticLibs/README
index 16a654453efe..8ad868de0443 100644
--- a/cmake/tribits/examples/MixedSharedStaticLibs/README
+++ b/cmake/tribits/examples/MixedSharedStaticLibs/README
@@ -3,7 +3,7 @@ MixedSharedStaticLibs
 ======================
 
 The purpose of this package is to demonstrate and test the usage of the the
-arguments SHARED and STATIC with TRIBITS_ADD_LIBRARY().
+arguments SHARED and STATIC with tribits_add_library().
 
 This package has to three subpackages: