Merge pull request #576 from TriBITSPub/63-combined-package-data-stru…

…ctures-7 (#63) Enables trilinos/Trilinos#11545
TriBITSPub · May 13, 2023 · b669da7 · b669da7
2 parents 31a5eae + 9e6f4b9
commit b669da7
Show file tree

Hide file tree

Showing 20 changed files with 668 additions and 211 deletions.
diff --git a/test/core/DependencyUnitTests/CMakeLists.txt b/test/core/DependencyUnitTests/CMakeLists.txt
@@ -669,8 +669,8 @@ create_reduced_dependency_handling_test_case(
     "Adjust the set of internal and external packages:"
     "-- Treating internal package RTOp as EXTERNAL because TPL_ENABLE_RTOp=ON"
     "-- Treating internal package Teuchos as EXTERNAL because downstream package RTOp being treated as EXTERNAL"
-    "-- NOTE: LAPACK is indirectly downstream from a TriBITS-compliant external package"
-    "-- NOTE: BLAS is indirectly downstream from a TriBITS-compliant external package"
+    "-- NOTE: LAPACK is indirectly upstream from a TriBITS-compliant external package"
+    "-- NOTE: BLAS is indirectly upstream from a TriBITS-compliant external package"
 
     "Final package build status [(]enabled only[)]:"
     "-- Final: BLAS_PACKAGE_BUILD_STATUS=EXTERNAL"
@@ -723,8 +723,8 @@ create_reduced_dependency_handling_test_case(
     "-- Treating internal package Teuchos as EXTERNAL because downstream package ThyraCoreLibs being treated as EXTERNAL"
     "-- Treating internal package RTOp as EXTERNAL because downstream package ThyraCoreLibs being treated as EXTERNAL"
     "-- Treating internal package Triutils as EXTERNAL because downstream package EpetraExt being treated as EXTERNAL"
-    "-- NOTE: LAPACK is indirectly downstream from a TriBITS-compliant external package"
-    "-- NOTE: BLAS is indirectly downstream from a TriBITS-compliant external package"
+    "-- NOTE: LAPACK is indirectly upstream from a TriBITS-compliant external package"
+    "-- NOTE: BLAS is indirectly upstream from a TriBITS-compliant external package"
 
     "Final package build status [(]enabled only[)]:"
     "-- Final: BLAS_PACKAGE_BUILD_STATUS=EXTERNAL"
@@ -1818,9 +1818,9 @@ create_dependency_handling_test_case(
     "-- Treating internal package RTOp as EXTERNAL because downstream package ThyraCoreLibs being treated as EXTERNAL"
     "-- Treating internal package Triutils as EXTERNAL because downstream package EpetraExt being treated as EXTERNAL"
     "-- Treating internal package Zoltan as EXTERNAL because downstream package EpetraExt being treated as EXTERNAL"
-    "-- NOTE: Boost is indirectly downstream from a TriBITS-compliant external package"
-    "-- NOTE: LAPACK is indirectly downstream from a TriBITS-compliant external package"
-    "-- NOTE: BLAS is indirectly downstream from a TriBITS-compliant external package"
+    "-- NOTE: Boost is indirectly upstream from a TriBITS-compliant external package"
+    "-- NOTE: LAPACK is indirectly upstream from a TriBITS-compliant external package"
+    "-- NOTE: BLAS is indirectly upstream from a TriBITS-compliant external package"
 
     "Final package build status [(]enabled only[)]:"
     "-- Final: BLAS_PACKAGE_BUILD_STATUS=EXTERNAL"
@@ -1898,10 +1898,10 @@ create_dependency_handling_test_case(
     "-- Treating internal package ThyraTpetra as EXTERNAL because downstream package Thyra being treated as EXTERNAL"
     "-- Treating internal package RTOp as EXTERNAL because downstream package ThyraCoreLibs being treated as EXTERNAL"
     "-- Treating internal package Zoltan as EXTERNAL because downstream package EpetraExt being treated as EXTERNAL"
-    "-- NOTE: Boost is indirectly downstream from a TriBITS-compliant external package"
-    "-- NOTE: LAPACK is indirectly downstream from a TriBITS-compliant external package"
-    "-- NOTE: BLAS is indirectly downstream from a TriBITS-compliant external package"
-    "-- NOTE: MPI is indirectly downstream from a TriBITS-compliant external package"
+    "-- NOTE: Boost is indirectly upstream from a TriBITS-compliant external package"
+    "-- NOTE: LAPACK is indirectly upstream from a TriBITS-compliant external package"
+    "-- NOTE: BLAS is indirectly upstream from a TriBITS-compliant external package"
+    "-- NOTE: MPI is indirectly upstream from a TriBITS-compliant external package"
 
     "Final set of enabled packages:  Shards Sacado Galeri Intrepid Phalanx Panzer 6"
     "Final set of non-enabled top-level packages:  TrilinosFramework Stokhos Isorropia RBGen 4"
@@ -1974,9 +1974,9 @@ create_dependency_handling_test_case(
     "-- Treating internal package ThyraTpetra as EXTERNAL because downstream package Thyra being treated as EXTERNAL"
     "-- Treating internal package RTOp as EXTERNAL because downstream package ThyraCoreLibs being treated as EXTERNAL"
     "-- Treating internal package Zoltan as EXTERNAL because downstream package EpetraExt being treated as EXTERNAL"
-    "-- NOTE: Boost is indirectly downstream from a TriBITS-compliant external package"
-    "-- NOTE: LAPACK is indirectly downstream from a TriBITS-compliant external package"
-    "-- NOTE: BLAS is indirectly downstream from a TriBITS-compliant external package"
+    "-- NOTE: Boost is indirectly upstream from a TriBITS-compliant external package"
+    "-- NOTE: LAPACK is indirectly upstream from a TriBITS-compliant external package"
+    "-- NOTE: BLAS is indirectly upstream from a TriBITS-compliant external package"
 
     "Final package build status [(]enabled only[)]:"
     "-- Final: BLAS_PACKAGE_BUILD_STATUS=EXTERNAL"