Merge pull request TriBITSPub#527 from TriBITSPub/63-combined-package…

…-data-structures-1

Refactor to use new nomenclature for packages and TPLs (TriBITSPub#63)

test/ci_support/CMakeLists.txt

@@ -145,7 +145,7 @@ tribits_add_advanced_test( get_tribits_packages_only_toplevel_packages
       "^TrilinosFramework,Teuchos,.*,Sacado,Thyra,Isorropia,.*,Phalanx,Panzer\n"
   )
 
-tribits_add_advanced_test( get_tribits_packages_all_se_packages
+tribits_add_advanced_test( get_tribits_packages_all_packages
   OVERALL_WORKING_DIRECTORY TEST_NAME
   OVERALL_NUM_MPI_PROCS 1
   TEST_0

test/ci_support/DumpXmlDepsTests/CMakeLists.txt

@@ -221,8 +221,8 @@ endfunction()
 create_dependency_xml_dump_test_case(
   BasePackagesTpls
   PASS_REGULAR_EXPRESSION_ALL
-    "Trilinos_NUM_PACKAGES='24'"
-    "Trilinos_NUM_TPLS='19'"
+    "Trilinos_NUM_DEFINED_INTERNAL_TOPLEVEL_PACKAGES='24'"
+    "Trilinos_NUM_DEFINED_TPLS='19'"
   COMPARE_XML_FILE
     TrilinosPackageDependencies.gold.xml
   )
@@ -234,8 +234,8 @@ create_dependency_xml_dump_test_case(
     -DTrilinos_EXTRA_REPOSITORIES=preCopyrightTrilinos
     -DLIST_ALWAYS_MISSING_PACKAGE=ON
   PASS_REGULAR_EXPRESSION_ALL
-    "Trilinos_NUM_PACKAGES='26'"
-    "Trilinos_NUM_TPLS='20'"
+    "Trilinos_NUM_DEFINED_INTERNAL_TOPLEVEL_PACKAGES='26'"
+    "Trilinos_NUM_DEFINED_TPLS='20'"
   COMPARE_XML_FILE
     TrilinosPackageDependencies.preCopyrightTrilinos.gold.xml
   )
@@ -252,8 +252,8 @@ create_dependency_xml_dump_test_case(
   ARGS
     -DTrilinos_EXTRA_REPOSITORIES=preCopyrightTrilinos,extraTrilinosRepo
   PASS_REGULAR_EXPRESSION_ALL
-    "Trilinos_NUM_PACKAGES='26'"
-    "Trilinos_NUM_TPLS='22'"
+    "Trilinos_NUM_DEFINED_INTERNAL_TOPLEVEL_PACKAGES='26'"
+    "Trilinos_NUM_DEFINED_TPLS='22'"
   COMPARE_XML_FILE
     TrilinosPackageDependencies.preCopyrightTrilinos.extraTrilinosRepo.gold.xml
   )
@@ -264,8 +264,8 @@ create_dependency_xml_dump_test_case(
   ARGS
     -DTrilinos_EXTRA_REPOSITORIES=extraRepoOnePackage
   PASS_REGULAR_EXPRESSION_ALL
-    "Trilinos_NUM_PACKAGES='24'"
-    "Trilinos_NUM_TPLS='19'"
+    "Trilinos_NUM_DEFINED_INTERNAL_TOPLEVEL_PACKAGES='24'"
+    "Trilinos_NUM_DEFINED_TPLS='19'"
   COMPARE_XML_FILE
     TrilinosPackageDependencies.extraRepoOnePackage.gold.xml
   )
@@ -278,8 +278,8 @@ create_dependency_xml_dump_test_case(
     -DTrilinos_EXTRA_REPOSITORIES=preCopyrightTrilinos
     -DLIST_ALWAYS_MISSING_PACKAGE=ON
   PASS_REGULAR_EXPRESSION_ALL
-    "Trilinos_NUM_PACKAGES='27'"
-    "Trilinos_NUM_TPLS='20'"
+    "Trilinos_NUM_DEFINED_INTERNAL_TOPLEVEL_PACKAGES='27'"
+    "Trilinos_NUM_DEFINED_TPLS='20'"
   COMPARE_XML_FILE
     TrilinosPackageDependencies.preRepoOnePackage.preCopyrightTrilinos.gold.xml
   )

test/core/CMakeLists.txt

@@ -102,7 +102,7 @@ tribits_add_advanced_test( TribitsReadAllProjectDepsFilesCreateDepsGraph_UnitTes
       -DCMAKE_CURRENT_LIST_DIR=${CMAKE_CURRENT_SOURCE_DIR}
       -P "${CMAKE_CURRENT_SOURCE_DIR}/TribitsReadAllProjectDepsFilesCreateDepsGraph_UnitTests.cmake"
     PASS_REGULAR_EXPRESSION_ALL
-      "Final UnitTests Result: num_run = 127"
+      "Final UnitTests Result: num_run = 125"
       "Final UnitTests Result: PASSED"
   )
 
@@ -116,7 +116,7 @@ tribits_add_advanced_test( TribitsAdjustPackageEnables_UnitTests
       -DCMAKE_CURRENT_LIST_DIR=${CMAKE_CURRENT_SOURCE_DIR}
       -P "${CMAKE_CURRENT_SOURCE_DIR}/TribitsAdjustPackageEnables_UnitTests.cmake"
     PASS_REGULAR_EXPRESSION_ALL
-      "Final UnitTests Result: num_run = 176"
+      "Final UnitTests Result: num_run = 182"
       "Final UnitTests Result: PASSED"
   )
 

test/core/DependencyUnitTests/DepTests_EnableAllPackages_DumpDependencies.txt

@@ -1,8 +1,19 @@
-Printing package dependencies ...
+Package dependencies information:
 
--- Trilinos_PACKAGES: TrilinosFramework Teuchos RTOp Epetra Zoltan Shards Triutils Tpetra EpetraExt Stokhos Sacado Thyra Isorropia AztecOO Galeri Amesos Intrepid Ifpack ML Belos Stratimikos RBGen Phalanx Panzer
+-- Trilinos_DEFINED_TPLS: MPI BLAS LAPACK Boost Scotch METIS ParMETIS CppUnit ADOLC ADIC TVMET y12m SuperLUDist SuperLU UMFPACK AMD PETSC MUMPS DUMMY
+-- Trilinos_NUM_DEFINED_TPLS='19'
 
--- Trilinos_SE_PACKAGES: TrilinosFramework Teuchos RTOp Epetra Zoltan Shards Triutils Tpetra EpetraExt Stokhos Sacado ThyraCoreLibs ThyraGoodStuff ThyraCrazyStuff ThyraEpetra ThyraEpetraExt ThyraTpetra Thyra Isorropia AztecOO Galeri Amesos Intrepid Ifpack ML Belos Stratimikos RBGen Phalanx Panzer
+-- Trilinos_DEFINED_INTERNAL_TOPLEVEL_PACKAGES: TrilinosFramework Teuchos RTOp Epetra Zoltan Shards Triutils Tpetra EpetraExt Stokhos Sacado Thyra Isorropia AztecOO Galeri Amesos Intrepid Ifpack ML Belos Stratimikos RBGen Phalanx Panzer
+-- Trilinos_NUM_DEFINED_INTERNAL_TOPLEVEL_PACKAGES='24'
+
+-- Trilinos_DEFINED_TOPLEVEL_PACKAGES: MPI BLAS LAPACK Boost Scotch METIS ParMETIS CppUnit ADOLC ADIC TVMET y12m SuperLUDist SuperLU UMFPACK AMD PETSC MUMPS DUMMY TrilinosFramework Teuchos RTOp Epetra Zoltan Shards Triutils Tpetra EpetraExt Stokhos Sacado Thyra Isorropia AztecOO Galeri Amesos Intrepid Ifpack ML Belos Stratimikos RBGen Phalanx Panzer
+-- Trilinos_NUM_DEFINED_TOPLEVEL_PACKAGES='43'
+
+-- Trilinos_DEFINED_INTERNAL_PACKAGES: TrilinosFramework Teuchos RTOp Epetra Zoltan Shards Triutils Tpetra EpetraExt Stokhos Sacado ThyraCoreLibs ThyraGoodStuff ThyraCrazyStuff ThyraEpetra ThyraEpetraExt ThyraTpetra Thyra Isorropia AztecOO Galeri Amesos Intrepid Ifpack ML Belos Stratimikos RBGen Phalanx Panzer
+-- Trilinos_NUM_DEFINED_INTERNAL_PACKAGES='30'
+
+-- Trilinos_DEFINED_PACKAGES: MPI BLAS LAPACK Boost Scotch METIS ParMETIS CppUnit ADOLC ADIC TVMET y12m SuperLUDist SuperLU UMFPACK AMD PETSC MUMPS DUMMY TrilinosFramework Teuchos RTOp Epetra Zoltan Shards Triutils Tpetra EpetraExt Stokhos Sacado ThyraCoreLibs ThyraGoodStuff ThyraCrazyStuff ThyraEpetra ThyraEpetraExt ThyraTpetra Thyra Isorropia AztecOO Galeri Amesos Intrepid Ifpack ML Belos Stratimikos RBGen Phalanx Panzer
+-- Trilinos_NUM_DEFINED_PACKAGES='49'
 
 -- TrilinosFramework_TEST_OPTIONAL_DEP_TPLS: MPI
 
@@ -100,131 +111,131 @@ Printing package dependencies ...
 
 Dumping direct dependencies for each package ...
 
--- MPI_LIB_ALL_DEPENDENCIES:
+-- MPI_LIB_DEFINED_DEPENDENCIES:
 
--- BLAS_LIB_ALL_DEPENDENCIES:
+-- BLAS_LIB_DEFINED_DEPENDENCIES:
 
--- LAPACK_LIB_ALL_DEPENDENCIES:
+-- LAPACK_LIB_DEFINED_DEPENDENCIES:
 
--- Boost_LIB_ALL_DEPENDENCIES:
+-- Boost_LIB_DEFINED_DEPENDENCIES:
 
--- Scotch_LIB_ALL_DEPENDENCIES:
+-- Scotch_LIB_DEFINED_DEPENDENCIES:
 
--- METIS_LIB_ALL_DEPENDENCIES:
+-- METIS_LIB_DEFINED_DEPENDENCIES:
 
--- ParMETIS_LIB_ALL_DEPENDENCIES:
+-- ParMETIS_LIB_DEFINED_DEPENDENCIES:
 
--- CppUnit_LIB_ALL_DEPENDENCIES:
+-- CppUnit_LIB_DEFINED_DEPENDENCIES:
 
--- ADOLC_LIB_ALL_DEPENDENCIES:
+-- ADOLC_LIB_DEFINED_DEPENDENCIES:
 
--- ADIC_LIB_ALL_DEPENDENCIES:
+-- ADIC_LIB_DEFINED_DEPENDENCIES:
 
--- TVMET_LIB_ALL_DEPENDENCIES:
+-- TVMET_LIB_DEFINED_DEPENDENCIES:
 
--- y12m_LIB_ALL_DEPENDENCIES:
+-- y12m_LIB_DEFINED_DEPENDENCIES:
 
--- SuperLUDist_LIB_ALL_DEPENDENCIES:
+-- SuperLUDist_LIB_DEFINED_DEPENDENCIES:
 
--- SuperLU_LIB_ALL_DEPENDENCIES:
+-- SuperLU_LIB_DEFINED_DEPENDENCIES:
 
--- UMFPACK_LIB_ALL_DEPENDENCIES:
+-- UMFPACK_LIB_DEFINED_DEPENDENCIES:
 
--- AMD_LIB_ALL_DEPENDENCIES:
+-- AMD_LIB_DEFINED_DEPENDENCIES:
 
--- PETSC_LIB_ALL_DEPENDENCIES:
+-- PETSC_LIB_DEFINED_DEPENDENCIES:
 
--- MUMPS_LIB_ALL_DEPENDENCIES:
+-- MUMPS_LIB_DEFINED_DEPENDENCIES:
 
--- DUMMY_LIB_ALL_DEPENDENCIES:
+-- DUMMY_LIB_DEFINED_DEPENDENCIES:
 
--- TrilinosFramework_LIB_ALL_DEPENDENCIES:
--- TrilinosFramework_TEST_ALL_DEPENDENCIES: MPI
+-- TrilinosFramework_LIB_DEFINED_DEPENDENCIES:
+-- TrilinosFramework_TEST_DEFINED_DEPENDENCIES: MPI
 
 -- Teuchos_LIB_ENABLED_DEPENDENCIES: BLAS LAPACK
--- Teuchos_LIB_ALL_DEPENDENCIES: BLAS LAPACK Boost MPI
+-- Teuchos_LIB_DEFINED_DEPENDENCIES: BLAS LAPACK Boost MPI
 
 -- RTOp_LIB_ENABLED_DEPENDENCIES: Teuchos
--- RTOp_LIB_ALL_DEPENDENCIES: Teuchos
+-- RTOp_LIB_DEFINED_DEPENDENCIES: Teuchos
 
 -- Epetra_LIB_ENABLED_DEPENDENCIES: BLAS LAPACK
--- Epetra_LIB_ALL_DEPENDENCIES: BLAS LAPACK MPI
+-- Epetra_LIB_DEFINED_DEPENDENCIES: BLAS LAPACK MPI
 
--- Zoltan_LIB_ALL_DEPENDENCIES: MPI ParMETIS Scotch Zlib
+-- Zoltan_LIB_DEFINED_DEPENDENCIES: MPI ParMETIS Scotch Zlib
 
--- Shards_TEST_ALL_DEPENDENCIES: Teuchos
+-- Shards_TEST_DEFINED_DEPENDENCIES: Teuchos
 
 -- Triutils_LIB_ENABLED_DEPENDENCIES: Epetra
--- Triutils_LIB_ALL_DEPENDENCIES: Epetra
+-- Triutils_LIB_DEFINED_DEPENDENCIES: Epetra
 
 -- Tpetra_LIB_ENABLED_DEPENDENCIES: Teuchos
--- Tpetra_LIB_ALL_DEPENDENCIES: Teuchos
--- Tpetra_TEST_ALL_DEPENDENCIES: Triutils
+-- Tpetra_LIB_DEFINED_DEPENDENCIES: Teuchos
+-- Tpetra_TEST_DEFINED_DEPENDENCIES: Triutils
 
 -- EpetraExt_LIB_ENABLED_DEPENDENCIES: Teuchos Epetra Triutils Zoltan
--- EpetraExt_LIB_ALL_DEPENDENCIES: Teuchos Epetra Triutils Zoltan UMFPACK AMD PETSC
+-- EpetraExt_LIB_DEFINED_DEPENDENCIES: Teuchos Epetra Triutils Zoltan UMFPACK AMD PETSC
 
--- Stokhos_LIB_ALL_DEPENDENCIES: Teuchos
+-- Stokhos_LIB_DEFINED_DEPENDENCIES: Teuchos
 
--- Sacado_LIB_ALL_DEPENDENCIES: Teuchos Stokhos Epetra EpetraExt
--- Sacado_TEST_ALL_DEPENDENCIES: ADOLC CppUnit
+-- Sacado_LIB_DEFINED_DEPENDENCIES: Teuchos Stokhos Epetra EpetraExt
+-- Sacado_TEST_DEFINED_DEPENDENCIES: ADOLC CppUnit
 
 -- ThyraCoreLibs_LIB_ENABLED_DEPENDENCIES: Teuchos RTOp
--- ThyraCoreLibs_LIB_ALL_DEPENDENCIES: Teuchos RTOp
+-- ThyraCoreLibs_LIB_DEFINED_DEPENDENCIES: Teuchos RTOp
 
--- ThyraGoodStuff_LIB_ALL_DEPENDENCIES: ThyraCoreLibs
+-- ThyraGoodStuff_LIB_DEFINED_DEPENDENCIES: ThyraCoreLibs
 
--- ThyraCrazyStuff_LIB_ALL_DEPENDENCIES: ThyraGoodStuff
+-- ThyraCrazyStuff_LIB_DEFINED_DEPENDENCIES: ThyraGoodStuff
 
 -- ThyraEpetra_LIB_ENABLED_DEPENDENCIES: Epetra ThyraCoreLibs
--- ThyraEpetra_LIB_ALL_DEPENDENCIES: Epetra ThyraCoreLibs
+-- ThyraEpetra_LIB_DEFINED_DEPENDENCIES: Epetra ThyraCoreLibs
 
 -- ThyraEpetraExt_LIB_ENABLED_DEPENDENCIES: ThyraEpetra EpetraExt
--- ThyraEpetraExt_LIB_ALL_DEPENDENCIES: ThyraEpetra EpetraExt
+-- ThyraEpetraExt_LIB_DEFINED_DEPENDENCIES: ThyraEpetra EpetraExt
 
 -- ThyraTpetra_LIB_ENABLED_DEPENDENCIES: Tpetra ThyraCoreLibs
--- ThyraTpetra_LIB_ALL_DEPENDENCIES: Tpetra ThyraCoreLibs
+-- ThyraTpetra_LIB_DEFINED_DEPENDENCIES: Tpetra ThyraCoreLibs
 
 -- Thyra_LIB_ENABLED_DEPENDENCIES: ThyraCoreLibs ThyraEpetra ThyraEpetraExt ThyraTpetra
--- Thyra_LIB_ALL_DEPENDENCIES: ThyraCoreLibs ThyraGoodStuff ThyraCrazyStuff ThyraEpetra ThyraEpetraExt ThyraTpetra
+-- Thyra_LIB_DEFINED_DEPENDENCIES: ThyraCoreLibs ThyraGoodStuff ThyraCrazyStuff ThyraEpetra ThyraEpetraExt ThyraTpetra
 
 -- Isorropia_LIB_ENABLED_DEPENDENCIES: Teuchos Epetra Zoltan EpetraExt
--- Isorropia_LIB_ALL_DEPENDENCIES: Teuchos Epetra Zoltan EpetraExt
+-- Isorropia_LIB_DEFINED_DEPENDENCIES: Teuchos Epetra Zoltan EpetraExt
 
 -- AztecOO_LIB_ENABLED_DEPENDENCIES: Epetra Triutils Teuchos
--- AztecOO_LIB_ALL_DEPENDENCIES: Epetra Triutils Teuchos y12m
+-- AztecOO_LIB_DEFINED_DEPENDENCIES: Epetra Triutils Teuchos y12m
 
 -- Galeri_LIB_ENABLED_DEPENDENCIES: Teuchos Epetra EpetraExt
--- Galeri_LIB_ALL_DEPENDENCIES: Teuchos Epetra EpetraExt
+-- Galeri_LIB_DEFINED_DEPENDENCIES: Teuchos Epetra EpetraExt
 
 -- Amesos_LIB_ENABLED_DEPENDENCIES: Teuchos Epetra EpetraExt
--- Amesos_LIB_ALL_DEPENDENCIES: Teuchos Epetra EpetraExt SuperLUDist ParMETIS UMFPACK SuperLU MUMPS
--- Amesos_TEST_ALL_DEPENDENCIES: Triutils Galeri
+-- Amesos_LIB_DEFINED_DEPENDENCIES: Teuchos Epetra EpetraExt SuperLUDist ParMETIS UMFPACK SuperLU MUMPS
+-- Amesos_TEST_DEFINED_DEPENDENCIES: Triutils Galeri
 
 -- Intrepid_LIB_ENABLED_DEPENDENCIES: Teuchos Shards
--- Intrepid_LIB_ALL_DEPENDENCIES: Teuchos Shards Sacado
--- Intrepid_TEST_ALL_DEPENDENCIES: Epetra EpetraExt Amesos
+-- Intrepid_LIB_DEFINED_DEPENDENCIES: Teuchos Shards Sacado
+-- Intrepid_TEST_DEFINED_DEPENDENCIES: Epetra EpetraExt Amesos
 
 -- Ifpack_LIB_ENABLED_DEPENDENCIES: Teuchos Epetra Amesos AztecOO
--- Ifpack_LIB_ALL_DEPENDENCIES: Teuchos Epetra Amesos AztecOO
--- Ifpack_TEST_ALL_DEPENDENCIES: Galeri
+-- Ifpack_LIB_DEFINED_DEPENDENCIES: Teuchos Epetra Amesos AztecOO
+-- Ifpack_TEST_DEFINED_DEPENDENCIES: Galeri
 
 -- ML_LIB_ENABLED_DEPENDENCIES: Teuchos Epetra Zoltan Galeri Amesos Ifpack AztecOO EpetraExt Isorropia BLAS LAPACK
--- ML_LIB_ALL_DEPENDENCIES: Teuchos Epetra Zoltan Galeri Amesos Ifpack AztecOO EpetraExt Isorropia BLAS LAPACK MPI METIS ParMETIS PETSC
--- ML_TEST_ALL_DEPENDENCIES: METIS ParMETIS
+-- ML_LIB_DEFINED_DEPENDENCIES: Teuchos Epetra Zoltan Galeri Amesos Ifpack AztecOO EpetraExt Isorropia BLAS LAPACK MPI METIS ParMETIS PETSC
+-- ML_TEST_DEFINED_DEPENDENCIES: METIS ParMETIS
 
--- Belos_LIB_ALL_DEPENDENCIES: Teuchos Epetra Tpetra
--- Belos_TEST_ALL_DEPENDENCIES: Triutils EpetraExt Ifpack ML
+-- Belos_LIB_DEFINED_DEPENDENCIES: Teuchos Epetra Tpetra
+-- Belos_TEST_DEFINED_DEPENDENCIES: Triutils EpetraExt Ifpack ML
 
 -- Stratimikos_LIB_ENABLED_DEPENDENCIES: ThyraEpetraExt ThyraCoreLibs Amesos AztecOO Ifpack ML
--- Stratimikos_LIB_ALL_DEPENDENCIES: ThyraEpetraExt ThyraCoreLibs Amesos AztecOO Belos Ifpack ML
--- Stratimikos_TEST_ALL_DEPENDENCIES: Triutils
+-- Stratimikos_LIB_DEFINED_DEPENDENCIES: ThyraEpetraExt ThyraCoreLibs Amesos AztecOO Belos Ifpack ML
+-- Stratimikos_TEST_DEFINED_DEPENDENCIES: Triutils
 
 -- RBGen_LIB_ENABLED_DEPENDENCIES: Teuchos Epetra EpetraExt DUMMY
--- RBGen_LIB_ALL_DEPENDENCIES: Teuchos Epetra EpetraExt DUMMY
+-- RBGen_LIB_DEFINED_DEPENDENCIES: Teuchos Epetra EpetraExt DUMMY
 
--- Phalanx_LIB_ALL_DEPENDENCIES: Teuchos Shards Sacado Boost
--- Phalanx_TEST_ALL_DEPENDENCIES: Belos Epetra Ifpack Intrepid TVMET
+-- Phalanx_LIB_DEFINED_DEPENDENCIES: Teuchos Shards Sacado Boost
+-- Phalanx_TEST_DEFINED_DEPENDENCIES: Belos Epetra Ifpack Intrepid TVMET
 
--- Panzer_LIB_ALL_DEPENDENCIES: Teuchos Sacado Phalanx Intrepid Thyra Tpetra Epetra EpetraExt Stokhos MPI Boost
--- Panzer_TEST_ALL_DEPENDENCIES: Stratimikos
+-- Panzer_LIB_DEFINED_DEPENDENCIES: Teuchos Sacado Phalanx Intrepid Thyra Tpetra Epetra EpetraExt Stokhos MPI Boost
+-- Panzer_TEST_DEFINED_DEPENDENCIES: Stratimikos

test/core/ExamplesUnitTests/RPATH_Handling_Tests.cmake

@@ -88,7 +88,7 @@ tribits_add_advanced_test( TribitsExampleProject_SimpleTpl_RPATH_default
       -DCMAKE_INSTALL_PREFIX=${RPATH_CURRENT_TEST_DIR}/install
       ${${PROJECT_NAME}_TRIBITS_DIR}/examples/TribitsExampleProject
     PASS_REGULAR_EXPRESSION_ALL
-      "Processing enabled package: SimpleCxx .Libs, Tests, Examples."
+      "Processing enabled top-level package: SimpleCxx .Libs, Tests, Examples."
       "Configuring done"
       "Generating done"
   # Above tests the standard install lib location

test/core/ExamplesUnitTests/TribitsExampleApp_Tests.cmake

@@ -461,10 +461,10 @@ function(TribitsExampleApp_EnableSingleSubpackage fullOrComponents sharedOrStati
         -DCMAKE_INSTALL_PREFIX=${testDir}/install
         ${testDir}/TribitsExampleProject
       PASS_REGULAR_EXPRESSION_ALL
-        "Final set of enabled packages:  SimpleCxx WithSubpackages 2"
-        "Final set of enabled SE packages:  SimpleCxx WithSubpackagesA WithSubpackagesB WithSubpackages 4"
-        "Final set of non-enabled packages:  MixedLang WrapExternal 2"
-        "Final set of non-enabled SE packages:  MixedLang WithSubpackagesC WrapExternal 3"
+        "Final set of enabled top-level packages:  SimpleCxx WithSubpackages 2"
+        "Final set of enabled packages:  SimpleCxx WithSubpackagesA WithSubpackagesB WithSubpackages 4"
+        "Final set of non-enabled top-level packages:  MixedLang WrapExternal 2"
+        "Final set of non-enabled packages:  MixedLang WithSubpackagesC WrapExternal 3"
       ALWAYS_FAIL_ON_NONZERO_RETURN
 
     TEST_3

test/core/ExamplesUnitTests/TribitsExampleMetaProject_Tests.cmake

@@ -18,8 +18,8 @@ tribits_add_advanced_test( TribitsExampleMetaProject_Empty
     PASS_REGULAR_EXPRESSION_ALL
       "NOTE: Ignoring missing extra repo 'TribitsExampleProject' as requested since .*/TribitsExampleMetaProject/TribitsExampleProject does not exist"
       "NOTE: Ignoring missing extra repo 'TribitsExampleProjectAddons' as requested since .*/TribitsExampleMetaProject/TribitsExampleProjectAddons does not exist"
-      "Final set of enabled SE packages:  0"
-      "Final set of non-enabled SE packages:  0"
+      "Final set of enabled packages:  0"
+      "Final set of non-enabled packages:  0"
       "WARNING:  There were no packages configured so no libraries or tests/examples will be built"
       "Configuring done"
       "Generating done"
@@ -74,9 +74,9 @@ tribits_add_advanced_test( TribitsExampleMetaProject
       "Reading list of POST extra TPLs from .*/TribitsExampleMetaProject/TribitsExampleProject/TPLsList.cmake"
       "Reading list of POST extra packages from .*/TribitsExampleMetaProject/TribitsExampleProjectAddons/PackagesList.cmake"
       "Reading list of POST extra TPLs from .*/TribitsExampleMetaProject/TribitsExampleProjectAddons/TPLsList.cmake"
-      "Final set of enabled SE packages:  SimpleCxx .* Addon1"
-      "Processing enabled package: SimpleCxx [(]Libs, Tests, Examples[)]"
-      "Processing enabled package: Addon1 [(]Libs, Tests, Examples[)]"
+      "Final set of enabled packages:  SimpleCxx .* Addon1"
+      "Processing enabled top-level package: SimpleCxx [(]Libs, Tests, Examples[)]"
+      "Processing enabled top-level package: Addon1 [(]Libs, Tests, Examples[)]"
       "Configuring done"
       "Generating done"
 
@@ -111,9 +111,9 @@ tribits_add_advanced_test( TribitsExampleMetaProject
       "Reading list of native TPLs from .*/TribitsExampleMetaProject/TPLsList.cmake"
       "Reading list of POST extra packages from .*/TribitsExampleMetaProject/TribitsExampleProjectAddons/PackagesList.cmake"
       "Reading list of POST extra TPLs from .*/TribitsExampleMetaProject/TribitsExampleProjectAddons/TPLsList.cmake"
-      "Final set of enabled SE packages:  SimpleCxx .* Addon1"
-      "Processing enabled package: SimpleCxx [(]Libs, Tests, Examples[)]"
-      "Processing enabled package: Addon1 [(]Libs, Tests, Examples[)]"
+      "Final set of enabled packages:  SimpleCxx .* Addon1"
+      "Processing enabled top-level package: SimpleCxx [(]Libs, Tests, Examples[)]"
+      "Processing enabled top-level package: Addon1 [(]Libs, Tests, Examples[)]"
       "Configuring done"
       "Generating done"
 

test/core/ExamplesUnitTests/TribitsExampleProject2_Tests.cmake

@@ -191,8 +191,8 @@ function(TribitsExampleProject2_find_tpl_parts  sharedOrStatic  findingTplsMetho
         -DTribitsExProj2_ENABLE_ALL_PACKAGES=ON
         ../TribitsExampleProject2
       PASS_REGULAR_EXPRESSION_ALL
-        "Final set of enabled packages:  Package1 Package2 Package3"
-        "Final set of enabled TPLs:  Tpl1 Tpl2 Tpl3 Tpl4 4"
+        "Final set of enabled top-level packages:  Package1 Package2 Package3"
+        "Final set of enabled external packages/TPLs:  Tpl1 Tpl2 Tpl3 Tpl4 4"
 
         "Tpl1_LIBRARY_NAMES='tpl1'"
         "Found lib '${tplInstallBaseDir}/install_tpl1/lib/libtpl1${libextregex}'"
@@ -357,9 +357,9 @@ function(TribitsExampleProject2_find_tpl_parts_no_optional_packages_tpls  shared
         ${${PROJECT_NAME}_TRIBITS_DIR}/examples/TribitsExampleProject2
       PASS_REGULAR_EXPRESSION_ALL
         "NOTE: Package3_ENABLE_Package2=OFF is already set so not enabling even though TribitsExProj2_ENABLE_Package2=ON is set"
-        "Final set of enabled packages:  Package1 Package2 Package3"
-        "Final set of enabled TPLs:  Tpl1 Tpl2 2"
-	"Final set of non-enabled TPLs:  Tpl3 Tpl4 2"
+        "Final set of enabled top-level packages:  Package1 Package2 Package3"
+        "Final set of enabled external packages/TPLs:  Tpl1 Tpl2 2"
+	"Final set of non-enabled external packages/TPLs:  Tpl3 Tpl4 2"
 
         "TPL_Tpl1_LIBRARIES='${tplInstallBaseDir}/install_tpl1/lib/libtpl1${libextregex}'"
         "TPL_Tpl1_INCLUDE_DIRS='${tplInstallBaseDir}/install_tpl1/include'"