Merge pull request #495 from bartlettroscoe/494-tpl-dependencies

Add support for FindTPL<tplName>Dependencies.cmake and doc updates (#63, #299, #494)
TriBITSPub · Jul 15, 2022 · 2446354 · 2446354
2 parents f36aad6 + e121d76
commit 2446354
Show file tree

Hide file tree

Showing 30 changed files with 1,061 additions and 484 deletions.
diff --git a/test/core/CMakeLists.txt b/test/core/CMakeLists.txt
@@ -136,6 +136,20 @@ tribits_add_advanced_test( TribitsWriteClientExportFiles_UnitTests
   )
 
 
+tribits_add_advanced_test( TribitsPackageDependencies_UnitTests
+  OVERALL_WORKING_DIRECTORY TEST_NAME
+  TEST_0 CMND ${CMAKE_COMMAND}
+    ARGS
+      -DPROJECT_NAME=${PROJECT_NAME}
+      -D${PROJECT_NAME}_TRIBITS_DIR=${${PROJECT_NAME}_TRIBITS_DIR}
+      -DCURRENT_TEST_DIRECTORY=${CMAKE_CURRENT_BINARY_DIR}
+      -P "${CMAKE_CURRENT_SOURCE_DIR}/TribitsPackageDependencies_UnitTests.cmake"
+    PASS_REGULAR_EXPRESSION_ALL
+      "Final UnitTests Result: num_run = 13"
+      "Final UnitTests Result: PASSED"
+  )
+
+
 tribits_add_advanced_test( TribitsExternalPackageWriteConfigFile_UnitTests
   OVERALL_WORKING_DIRECTORY TEST_NAME
   TEST_0 CMND ${CMAKE_COMMAND}
@@ -145,7 +159,7 @@ tribits_add_advanced_test( TribitsExternalPackageWriteConfigFile_UnitTests
       -DCURRENT_TEST_DIRECTORY=${CMAKE_CURRENT_BINARY_DIR}
       -P "${CMAKE_CURRENT_SOURCE_DIR}/TribitsExternalPackageWriteConfigFile_UnitTests.cmake"
     PASS_REGULAR_EXPRESSION_ALL
-      "Final UnitTests Result: num_run = 85"
+      "Final UnitTests Result: num_run = 74"
       "Final UnitTests Result: PASSED"
   )
 

diff --git a/test/core/DependencyUnitTests/DepTests_EnableAllPackages_DumpDependencies.txt b/test/core/DependencyUnitTests/DepTests_EnableAllPackages_DumpDependencies.txt
@@ -98,8 +98,47 @@ Printing package dependencies ...
 -- Panzer_LIB_REQUIRED_DEP_TPLS: MPI Boost
 
 
-Dumping direct dependencies for each SE package ...
+Dumping direct dependencies for each package ...
 
+-- MPI_LIB_ALL_DEPENDENCIES:
+
+-- BLAS_LIB_ALL_DEPENDENCIES:
+
+-- LAPACK_LIB_ALL_DEPENDENCIES:
+
+-- Boost_LIB_ALL_DEPENDENCIES:
+
+-- Scotch_LIB_ALL_DEPENDENCIES:
+
+-- METIS_LIB_ALL_DEPENDENCIES:
+
+-- ParMETIS_LIB_ALL_DEPENDENCIES:
+
+-- CppUnit_LIB_ALL_DEPENDENCIES:
+
+-- ADOLC_LIB_ALL_DEPENDENCIES:
+
+-- ADIC_LIB_ALL_DEPENDENCIES:
+
+-- TVMET_LIB_ALL_DEPENDENCIES:
+
+-- y12m_LIB_ALL_DEPENDENCIES:
+
+-- SuperLUDist_LIB_ALL_DEPENDENCIES:
+
+-- SuperLU_LIB_ALL_DEPENDENCIES:
+
+-- UMFPACK_LIB_ALL_DEPENDENCIES:
+
+-- AMD_LIB_ALL_DEPENDENCIES:
+
+-- PETSC_LIB_ALL_DEPENDENCIES:
+
+-- MUMPS_LIB_ALL_DEPENDENCIES:
+
+-- DUMMY_LIB_ALL_DEPENDENCIES:
+
+-- TrilinosFramework_LIB_ALL_DEPENDENCIES:
 -- TrilinosFramework_TEST_ALL_DEPENDENCIES: MPI
 
 -- Teuchos_LIB_ENABLED_DEPENDENCIES: BLAS LAPACK

diff --git a/test/core/ExamplesUnitTests/TribitsExampleProject_Tests.cmake b/test/core/ExamplesUnitTests/TribitsExampleProject_Tests.cmake
@@ -176,7 +176,7 @@ function(TribitsExampleProject_ALL_ST_NoFortran  sharedOrStatic  serialOrMpi)
         "Setting TribitsExProj_ENABLE_WithSubpackages=ON"
         "Setting TPL_ENABLE_HeaderOnlyTpl=ON because it is required by the enabled package SimpleCxx"
         "Set cache entries for optional packages/TPLs and tests/examples for packages actually enabled ..."
-        "Dumping direct dependencies for each SE package ..."
+        "Dumping direct dependencies for each package ..."
         "-- SimpleCxx_LIB_ENABLED_DEPENDENCIES: HeaderOnlyTpl"
         "-- SimpleCxx_LIB_ALL_DEPENDENCIES: HeaderOnlyTpl SimpleTpl"
         "-- MixedLang_LIB_ALL_DEPENDENCIES: "