Merge branch 'tribits_github_snapshot' into 10774-fix-tpl-config-inst…

…all-tree (#10774) Addresses TriBITSPub/TriBITS#500 which is part of #10774.
trilinos · Jul 20, 2022 · 4038856 · 4038856
2 parents 3020a21 + f7f6ed3
commit 4038856
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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: