Automatic snapshot commit from tribits at 24e96fe7

Origin repo remote tracking branch: 'github/master' Origin repo remote repo URL: 'github = [email protected]:TriBITSPub/TriBITS.git' Git describe: vera-release-3.5-start-1802-g6d9eaef0 At commit: commit 24e96fe74bfca6c42b8aedb96468ee4ed22a8062 Author: Roscoe A. Bartlett <[email protected]> Date: Tue Jun 27 08:14:20 2023 -0600 Summary: Print out <Package>_DIR and error out if not set (trilinos#63)
bartlettroscoe · Jun 27, 2023 · dd2d7b9 · dd2d7b9
1 parent eb711b5
commit dd2d7b9
Show file tree

Hide file tree

Showing 24 changed files with 568 additions and 541 deletions.
diff --git a/cmake/tribits/CHANGELOG.md b/cmake/tribits/CHANGELOG.md
@@ -2,7 +2,33 @@
 ChangeLog for TriBITS
 ----------------------------------------
 
-## 2023-5-03:
+## 2023-06-22:
+
+* **Added:** Packages are now determined to be missing if their dependencies
+  file `<packageDir>/cmake/Dependencies.cmake` is missing.  If the package
+  directory `<packageDir>` exists but the dependencies file is missing, the
+  package is determined to be missing but a warning is printed.  (This expands
+  behavior to gracefully deal with a situation where a package source
+  directory is only partially removed, such as with `git rm -r <packageDir>`,
+  but the base directory still exists.  Therefore, this allows the project to
+  gracefully configure with the package being considered missing and avoids a
+  fatal error in this case.)
+
+## 2023-06-02:
+
+* **Added/Deprecated:** External packages/TPLs can now be (and should be)
+  listed in the `[TEST|LIB]_[REQUIRED|OPTIONAL]_PACKAGES` arguments/lists in
+  the macro `tribits_package_define_dependencies()` and the
+  `[TEST|LIB]_[REQUIRED|OPTIONAL]_TPLS` arguments/lists are deprecated (but
+  with no deprecation warning yet).  This makes it easier to write
+  `<packageDir>/cmake/Dependencies.cmake` files for packages where the set of
+  internal and external upstream dependent packages is dynamic and changes
+  depending on the TriBITS project where these package are configured under.
+  (And conceptually, a downstream package should not care if an upstream
+  dependent package is pulled in as an external package or built as an
+  internal package.)
+
+## 2023-05-03:
 
 * **Added:** Added support for non-fully TriBITS-compatible external packages.
   Now, a `<Package>Config.cmake` file need not define

diff --git a/cmake/tribits/ci_support/TribitsWriteXmlDependenciesFiles.cmake b/cmake/tribits/ci_support/TribitsWriteXmlDependenciesFiles.cmake
@@ -45,6 +45,9 @@
 ################################################################################
 
 
+include(TribitsConfigureTiming)
+
+
 # @MACRO: tribits_write_xml_dependency_files()
 #
 # Usage::

diff --git a/cmake/tribits/core/package_arch/TribitsConfigureTiming.cmake b/cmake/tribits/core/package_arch/TribitsConfigureTiming.cmake
@@ -0,0 +1,97 @@
+# @HEADER
+# ************************************************************************
+#
+#            TriBITS: Tribal Build, Integrate, and Test System
+#                    Copyright 2013 Sandia Corporation
+#
+# Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+# the U.S. Government retains certain rights in this software.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# 3. Neither the name of the Corporation nor the names of the
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL SANDIA CORPORATION OR THE
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# ************************************************************************
+# @HEADER
+
+
+include(TimingUtils)
+
+
+# Optionally start CMake code configure timing
+#
+function(tribits_config_code_start_timer  START_TIMER_SECONDS_VAR_OUT)
+  if (${PROJECT_NAME}_ENABLE_CONFIGURE_TIMING)
+    timer_get_raw_seconds(START_TIMER_SECONDS)
+    set(${START_TIMER_SECONDS_VAR_OUT} ${START_TIMER_SECONDS} PARENT_SCOPE)
+  endif()
+endfunction()
+
+
+# Optionally stop CMake code configure timing
+#
+function(tribits_config_code_stop_timer  START_TIMER_SECONDS_VAR_IN
+  TIMER_STR
+  )
+  if (${PROJECT_NAME}_ENABLE_CONFIGURE_TIMING)
+    timer_get_raw_seconds(TIMER_STOP_SECONDS)
+    timer_print_rel_time(${${START_TIMER_SECONDS_VAR_IN}}
+      ${TIMER_STOP_SECONDS}
+      "${TIMER_STR}")
+  endif()
+endfunction()
+
+
+# Optionally start CMake code **package** configure timing
+#
+function(tribits_package_config_code_start_timer  START_TIMER_SECONDS_VAR_OUT)
+  if (${PROJECT_NAME}_ENABLE_CONFIGURE_TIMING
+      AND
+      ( ${PROJECT_NAME}_ENABLE_PACKAGE_CONFIGURE_TIMING
+        OR ${TRIBITS_PACKAGE}_PACKAGE_CONFIGURE_TIMING )
+    )
+    timer_get_raw_seconds(START_TIMER_SECONDS)
+    set(${START_TIMER_SECONDS_VAR_OUT} ${START_TIMER_SECONDS} PARENT_SCOPE)
+  endif()
+endfunction()
+
+
+# Optionally stop CMake code **package** configure timing
+#
+function(tribits_package_config_code_stop_timer  START_TIMER_SECONDS_VAR_IN
+  TIMER_STR
+  )
+  if (${PROJECT_NAME}_ENABLE_CONFIGURE_TIMING
+      AND
+      ( ${PROJECT_NAME}_ENABLE_PACKAGE_CONFIGURE_TIMING
+        OR ${TRIBITS_PACKAGE}_PACKAGE_CONFIGURE_TIMING )
+    )
+    timer_get_raw_seconds(TIMER_STOP_SECONDS)
+    timer_print_rel_time(${${START_TIMER_SECONDS_VAR_IN}}
+      ${TIMER_STOP_SECONDS}
+      "${TIMER_STR}")
+  endif()
+endfunction()
diff --git a/cmake/tribits/core/package_arch/TribitsFindMostRecentFileTimestamp.cmake b/cmake/tribits/core/package_arch/TribitsFindMostRecentFileTimestamp.cmake
@@ -37,6 +37,9 @@
 # ************************************************************************
 # @HEADER
 
+
+include(TribitsConfigureTiming)
+
 include(CMakeParseArguments)
 
 

diff --git a/cmake/tribits/core/package_arch/TribitsGeneralMacros.cmake b/cmake/tribits/core/package_arch/TribitsGeneralMacros.cmake
@@ -46,62 +46,6 @@ include(TribitsDeprecatedHelpers)
 include(TribitsGetPackageEnableStatus)
 
 
-# Optionally start CMake code configure timing
-#
-function(tribits_config_code_start_timer  START_TIMER_SECONDS_VAR_OUT)
-  if (${PROJECT_NAME}_ENABLE_CONFIGURE_TIMING)
-    timer_get_raw_seconds(START_TIMER_SECONDS)
-    set(${START_TIMER_SECONDS_VAR_OUT} ${START_TIMER_SECONDS} PARENT_SCOPE)
-  endif()
-endfunction()
-
-
-# Optionally stop CMake code configure timing
-#
-function(tribits_config_code_stop_timer  START_TIMER_SECONDS_VAR_IN
-  TIMER_STR
-  )
-  if (${PROJECT_NAME}_ENABLE_CONFIGURE_TIMING)
-    timer_get_raw_seconds(TIMER_STOP_SECONDS)
-    timer_print_rel_time(${${START_TIMER_SECONDS_VAR_IN}}
-      ${TIMER_STOP_SECONDS}
-      "${TIMER_STR}")
-  endif()
-endfunction()
-
-
-# Optionally start CMake code **package** configure timing
-#
-function(tribits_package_config_code_start_timer  START_TIMER_SECONDS_VAR_OUT)
-  if (${PROJECT_NAME}_ENABLE_CONFIGURE_TIMING
-      AND
-      ( ${PROJECT_NAME}_ENABLE_PACKAGE_CONFIGURE_TIMING
-        OR ${TRIBITS_PACKAGE}_PACKAGE_CONFIGURE_TIMING )
-    )
-    timer_get_raw_seconds(START_TIMER_SECONDS)
-    set(${START_TIMER_SECONDS_VAR_OUT} ${START_TIMER_SECONDS} PARENT_SCOPE)
-  endif()
-endfunction()
-
-
-# Optionally stop CMake code **package** configure timing
-#
-function(tribits_package_config_code_stop_timer  START_TIMER_SECONDS_VAR_IN
-  TIMER_STR
-  )
-  if (${PROJECT_NAME}_ENABLE_CONFIGURE_TIMING
-      AND
-      ( ${PROJECT_NAME}_ENABLE_PACKAGE_CONFIGURE_TIMING
-        OR ${TRIBITS_PACKAGE}_PACKAGE_CONFIGURE_TIMING )
-    )
-    timer_get_raw_seconds(TIMER_STOP_SECONDS)
-    timer_print_rel_time(${${START_TIMER_SECONDS_VAR_IN}}
-      ${TIMER_STOP_SECONDS}
-      "${TIMER_STR}")
-  endif()
-endfunction()
-
-
 # Set the combined directory name taking into account '.' repos.
 #
 function(tribits_get_repo_name  REPO_DIR  REPO_NAME_OUT)