Skip to content

Commit

Permalink
Merge pull request #546 from TriBITSPub/63-combined-package-data-stru…
Browse files Browse the repository at this point in the history
…ctures-4
  • Loading branch information
bartlettroscoe authored Dec 12, 2022
2 parents 559f1ec + a83361a commit bcfeeb1
Show file tree
Hide file tree
Showing 48 changed files with 1,675 additions and 1,937 deletions.
2 changes: 2 additions & 0 deletions common_tools/FindTPLLAPACKDependencies.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
tribits_extpkg_define_dependencies( LAPACK
DEPENDENCIES BLAS)
4 changes: 2 additions & 2 deletions test/core/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ tribits_add_advanced_test( TestingFunctionMacro_UnitTests
-D${PROJECT_NAME}_TRIBITS_DIR=${${PROJECT_NAME}_TRIBITS_DIR}
-P "${CMAKE_CURRENT_SOURCE_DIR}/TestingFunctionMacro_UnitTests.cmake"
PASS_REGULAR_EXPRESSION_ALL
"Final UnitTests Result: num_run = 719"
"Final UnitTests Result: num_run = 721"
"Final UnitTests Result: PASSED"
)

Expand All @@ -75,7 +75,7 @@ tribits_add_advanced_test( TribitsProcessPackagesAndDirsLists_UnitTests
-D${PROJECT_NAME}_TRIBITS_DIR=${${PROJECT_NAME}_TRIBITS_DIR}
-P "${CMAKE_CURRENT_SOURCE_DIR}/TribitsProcessPackagesAndDirsLists_UnitTests.cmake"
PASS_REGULAR_EXPRESSION_ALL
"Final UnitTests Result: num_run = 34"
"Final UnitTests Result: num_run = 31"
"Final UnitTests Result: PASSED"
)

Expand Down
164 changes: 145 additions & 19 deletions test/core/DependencyUnitTests/CMakeLists.txt

Large diffs are not rendered by default.

Large diffs are not rendered by default.

53 changes: 17 additions & 36 deletions test/core/ExamplesUnitTests/TribitsExampleProject_Tests.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -150,37 +150,16 @@ function(TribitsExampleProject_ALL_ST_NoFortran sharedOrStatic serialOrMpi)
"-- TribitsExProj_DEFINED_INTERNAL_TOPLEVEL_PACKAGES: SimpleCxx MixedLang WithSubpackages WrapExternal"
"-- TribitsExProj_DEFINED_INTERNAL_PACKAGES: SimpleCxx MixedLang WithSubpackagesA WithSubpackagesB WithSubpackagesC WithSubpackages WrapExternal"

"-- SimpleCxx_FORWARD_LIB_REQUIRED_DEP_PACKAGES: WithSubpackagesA WithSubpackagesB"
"-- SimpleCxx_LIB_REQUIRED_DEP_TPLS: HeaderOnlyTpl"
"-- SimpleCxx_LIB_OPTIONAL_DEP_TPLS: SimpleTpl MPI"
"-- SimpleCxx_LIB_DEFINED_DEPENDENCIES: HeaderOnlyTpl.R. SimpleTpl.O. MPI.O."
"-- SimpleCxx_FORWARD_LIB_DEFINED_DEPENDENCIES: WithSubpackagesA.R. WithSubpackagesB.R."
"-- MixedLang_FORWARD_LIB_OPTIONAL_DEP_PACKAGES: WrapExternal"
"-- MixedLang_FORWARD_TEST_OPTIONAL_DEP_PACKAGES: WithSubpackagesB"
"-- MixedLang_FORWARD_LIB_DEFINED_DEPENDENCIES: WrapExternal.O."
"-- MixedLang_FORWARD_TEST_DEFINED_DEPENDENCIES: WithSubpackagesB.O."
"-- WithSubpackagesA_LIB_REQUIRED_DEP_PACKAGES: SimpleCxx"
"-- WithSubpackagesA_FORWARD_LIB_REQUIRED_DEP_PACKAGES: WithSubpackagesC WithSubpackages WrapExternal"
"-- WithSubpackagesA_FORWARD_LIB_OPTIONAL_DEP_PACKAGES: WithSubpackagesB"
"-- WithSubpackagesA_LIB_DEFINED_DEPENDENCIES: SimpleCxx.R."
"-- WithSubpackagesA_FORWARD_LIB_DEFINED_DEPENDENCIES: WithSubpackagesB.O. WithSubpackagesC.R. WithSubpackages.R. WrapExternal.R."
"-- WithSubpackagesB_LIB_REQUIRED_DEP_PACKAGES: SimpleCxx"
"-- WithSubpackagesB_LIB_OPTIONAL_DEP_PACKAGES: WithSubpackagesA"
"-- WithSubpackagesB_TEST_OPTIONAL_DEP_PACKAGES: MixedLang"
"-- WithSubpackagesB_FORWARD_LIB_REQUIRED_DEP_PACKAGES: WithSubpackagesC"
"-- WithSubpackagesB_FORWARD_LIB_OPTIONAL_DEP_PACKAGES: WithSubpackages"
"-- WithSubpackagesB_LIB_DEFINED_DEPENDENCIES: SimpleCxx.R. WithSubpackagesA.O."
"-- WithSubpackagesB_TEST_DEFINED_DEPENDENCIES: MixedLang.O."
"-- WithSubpackagesB_FORWARD_LIB_DEFINED_DEPENDENCIES: WithSubpackagesC.R. WithSubpackages.O."
"-- WithSubpackagesC_LIB_REQUIRED_DEP_PACKAGES: WithSubpackagesA WithSubpackagesB"
"-- WithSubpackagesC_FORWARD_LIB_OPTIONAL_DEP_PACKAGES: WithSubpackages"
"-- WithSubpackagesC_LIB_DEFINED_DEPENDENCIES: WithSubpackagesA.R. WithSubpackagesB.R."
"-- WithSubpackagesC_FORWARD_LIB_DEFINED_DEPENDENCIES: WithSubpackages.O."
"-- WithSubpackages_LIB_REQUIRED_DEP_PACKAGES: WithSubpackagesA"
"-- WithSubpackages_LIB_OPTIONAL_DEP_PACKAGES: WithSubpackagesB WithSubpackagesC"
"-- WithSubpackages_LIB_DEFINED_DEPENDENCIES: WithSubpackagesA.R. WithSubpackagesB.O. WithSubpackagesC.O."
"-- WrapExternal_LIB_REQUIRED_DEP_PACKAGES: WithSubpackagesA"
"-- WrapExternal_LIB_OPTIONAL_DEP_PACKAGES: MixedLang"
"-- WrapExternal_LIB_DEFINED_DEPENDENCIES: WithSubpackagesA.R. MixedLang.O."

"Setting up export dependencies for all enabled packages ..."
Expand All @@ -195,32 +174,34 @@ function(TribitsExampleProject_ALL_ST_NoFortran sharedOrStatic serialOrMpi)
"Enabling all packages that are not currently disabled because of TribitsExProj_ENABLE_ALL_PACKAGES=ON "
"Setting TribitsExProj_ENABLE_SimpleCxx=ON"
"Setting TribitsExProj_ENABLE_WithSubpackages=ON"
"Setting TPL_ENABLE_HeaderOnlyTpl=ON because it is required by the enabled package SimpleCxx"
"Setting TPL_ENABLE_HeaderOnlyTpl=ON because SimpleCxx has a required dependence on HeaderOnlyTpl"
"Set cache entries for optional packages/TPLs and tests/examples for packages actually enabled ..."
"Dumping direct dependencies for each package ..."
"-- SimpleCxx_LIB_ENABLED_DEPENDENCIES: HeaderOnlyTpl"
"-- SimpleCxx_LIB_DEFINED_DEPENDENCIES: HeaderOnlyTpl SimpleTpl"
"-- MixedLang_LIB_DEFINED_DEPENDENCIES: "
"-- WithSubpackagesA_LIB_ENABLED_DEPENDENCIES: SimpleCxx"
"-- WithSubpackagesA_LIB_DEFINED_DEPENDENCIES: SimpleCxx"
"-- WithSubpackagesB_LIB_ENABLED_DEPENDENCIES: SimpleCxx WithSubpackagesA"
"-- WithSubpackagesB_LIB_DEFINED_DEPENDENCIES: SimpleCxx WithSubpackagesA"
"-- WithSubpackagesB_TEST_DEFINED_DEPENDENCIES: MixedLang"
"-- WithSubpackagesC_LIB_ENABLED_DEPENDENCIES: WithSubpackagesA WithSubpackagesB"
"-- WithSubpackagesC_LIB_DEFINED_DEPENDENCIES: WithSubpackagesA WithSubpackagesB"
"-- WithSubpackages_LIB_ENABLED_DEPENDENCIES: WithSubpackagesA WithSubpackagesB WithSubpackagesC"
"-- WithSubpackages_LIB_DEFINED_DEPENDENCIES: WithSubpackagesA WithSubpackagesB WithSubpackagesC"
"-- WrapExternal_LIB_DEFINED_DEPENDENCIES: WithSubpackagesA MixedLang"

"Dumping direct enabled dependencies for each package ..."
"-- MPI: No enabled dependencies!"
"-- HeaderOnlyTpl: No enabled dependencies!"
"-- SimpleTpl: No enabled dependencies!"
"-- SimpleCxx_LIB_ENABLED_DEPENDENCIES: HeaderOnlyTpl.R."
"-- MixedLang: No enabled dependencies!"
"-- WithSubpackagesA_LIB_ENABLED_DEPENDENCIES: SimpleCxx.R."
"-- WithSubpackagesB_LIB_ENABLED_DEPENDENCIES: SimpleCxx.R. WithSubpackagesA.O."
"-- WithSubpackagesC_LIB_ENABLED_DEPENDENCIES: WithSubpackagesA.R. WithSubpackagesB.R."
"-- WithSubpackages_LIB_ENABLED_DEPENDENCIES: WithSubpackagesA.R. WithSubpackagesB.O. WithSubpackagesC.O."
"-- WrapExternal: No enabled dependencies!"

"Final set of enabled top-level packages: SimpleCxx WithSubpackages 2"
"Final set of enabled packages: SimpleCxx WithSubpackagesA WithSubpackagesB WithSubpackagesC WithSubpackages 5"
"Final set of enabled external packages/TPLs: ${FINAL_ENABLED_TPLS}"
"Final set of non-enabled top-level packages: MixedLang WrapExternal 2"

"Processing enabled external package/TPL: HeaderOnlyTpl"
"-- File Trace: TPL INCLUDE .+/TribitsExampleProject/cmake/tpls/FindTPLHeaderOnlyTpl.cmake"
"-- TPL_HeaderOnlyTpl_INCLUDE_DIRS='.+/examples/tpls/HeaderOnlyTpl'"

"Performing Test HAVE_SIMPLECXX___INT64"
"Configuring done"
"Generating done"

"Build files have been written to: .*ExamplesUnitTests/${testName}"
"-- File Trace: PROJECT INCLUDE .*/TribitsExampleProject/Version.cmake"
"-- File Trace: REPOSITORY INCLUDE .*/TribitsExampleProject/cmake/CallbackSetupExtraOptions.cmake"
Expand Down
16 changes: 8 additions & 8 deletions test/core/ProcessEnabledTpls/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ create_process_enabled_tpls_test_case(
TPL_NAME HeaderOnlyTpl
TPL_FINDMOD ${HeaderOnlyTpl_FINDMOD}
INCLUDE_DIRS "/path_does_not_exist"
EXTR_ARGS -DTPL_HeaderOnlyTpl_ENABLING_PKG=SimpleCxx
EXTR_ARGS -DHeaderOnlyTpl_ENABLING_PKG=SimpleCxx
PASS_REGULAR_EXPRESSION_ALL
"Processing enabled external package/TPL: HeaderOnlyTpl .enabled by SimpleCxx, disable with -DTPL_ENABLE_HeaderOnlyTpl=OFF."
"-- Must find at least one header in each of the header sets .HeaderOnlyTpl_stuff.hpp."
Expand Down Expand Up @@ -450,7 +450,7 @@ create_process_enabled_tpls_test_case(
TPL_FINDMOD ${HeadersAndLibsTpl_FINDMOD}
INCLUDE_DIRS ${HeadersAndLibsTpl_BASE_DIR}/include
LIBRARY_DIRS /path/does/not/exist
EXTR_ARGS -DTPL_HeadersAndLibsTpl_ENABLING_PKG=SomePackage
EXTR_ARGS -DHeadersAndLibsTpl_ENABLING_PKG=SomePackage
PASS_REGULAR_EXPRESSION_ALL
"Processing enabled external package/TPL: HeadersAndLibsTpl .enabled by SomePackage, disable with -DTPL_ENABLE_HeadersAndLibsTpl=OFF."
"-- Must find at least one lib in each of the lib sets .haltpl1[;]haltpl2."
Expand Down Expand Up @@ -492,7 +492,7 @@ create_process_enabled_tpls_test_case(
TPL_FINDMOD ${HeadersAndLibsTpl_FINDMOD}
INCLUDE_DIRS ${HeadersAndLibsTpl_BASE_DIR}/include
LIBRARY_DIRS /path/does/not/exist
EXTR_ARGS -DTPL_HeadersAndLibsTpl_ENABLING_PKG=SomePackage
EXTR_ARGS -DHeadersAndLibsTpl_ENABLING_PKG=SomePackage
-DNOT_MUST_FIND_ALL_LIBS=ON
PASS_REGULAR_EXPRESSION_ALL
"Processing enabled external package/TPL: HeadersAndLibsTpl .enabled by SomePackage, disable with -DTPL_ENABLE_HeadersAndLibsTpl=OFF."
Expand All @@ -515,7 +515,7 @@ create_process_enabled_tpls_test_case(
INCLUDE_DIRS ${HeadersAndLibsTpl_BASE_DIR}/include
LIBRARY_DIRS ${HeadersAndLibsTpl_BASE_DIR}/lib
EXTRA_ARGS -DHeadersAndLibsTpl_LIBRARY_NAMES="badlibname"
-DTPL_HeadersAndLibsTpl_ENABLING_PKG=SomePackage
-DHeadersAndLibsTpl_ENABLING_PKG=SomePackage
PASS_REGULAR_EXPRESSION_ALL
"Processing enabled external package/TPL: HeadersAndLibsTpl .enabled by SomePackage, disable with -DTPL_ENABLE_HeadersAndLibsTpl=OFF."
"-- Must find at least one lib in each of the lib sets .badlibname."
Expand All @@ -538,7 +538,7 @@ create_process_enabled_tpls_test_case(
INCLUDE_DIRS ${HeadersAndLibsTpl_BASE_DIR}/include
LIBRARY_DIRS ${HeadersAndLibsTpl_BASE_DIR}/lib
EXTRA_ARGS -DHeadersAndLibsTpl_LIBRARY_NAMES="badlibname,"
-DTPL_HeadersAndLibsTpl_ENABLING_PKG=SomePackage
-DHeadersAndLibsTpl_ENABLING_PKG=SomePackage
-DNOT_MUST_FIND_ALL_LIBS=ON
PASS_REGULAR_EXPRESSION_ALL
"Processing enabled external package/TPL: HeadersAndLibsTpl .enabled by SomePackage, disable with -DTPL_ENABLE_HeadersAndLibsTpl=OFF."
Expand All @@ -557,7 +557,7 @@ create_process_enabled_tpls_test_case(
INCLUDE_DIRS ${HeadersAndLibsTpl_BASE_DIR}/include
LIBRARY_DIRS ${HeadersAndLibsTpl_BASE_DIR}/lib
EXTRA_ARGS -DHeadersAndLibsTpl_LIBRARY_NAMES="haltpl2,badlibname"
-DTPL_HeadersAndLibsTpl_ENABLING_PKG=SomePackage
-DHeadersAndLibsTpl_ENABLING_PKG=SomePackage
PASS_REGULAR_EXPRESSION_ALL
"Processing enabled external package/TPL: HeadersAndLibsTpl .enabled by SomePackage, disable with -DTPL_ENABLE_HeadersAndLibsTpl=OFF."
"-- Searching for libs in HeadersAndLibsTpl_LIBRARY_DIRS='.+/HeadersAndLibsTpl/lib'"
Expand All @@ -575,7 +575,7 @@ create_process_enabled_tpls_test_case(
INCLUDE_DIRS ${HeadersAndLibsTpl_BASE_DIR}/include
LIBRARY_DIRS ${HeadersAndLibsTpl_BASE_DIR}/lib
EXTRA_ARGS -DHeadersAndLibsTpl_LIBRARY_NAMES="haltpl2,badlibname"
-DTPL_HeadersAndLibsTpl_ENABLING_PKG=SomePackage
-DHeadersAndLibsTpl_ENABLING_PKG=SomePackage
-DNOT_MUST_FIND_ALL_LIBS=ON
PASS_REGULAR_EXPRESSION_ALL
"Processing enabled external package/TPL: HeadersAndLibsTpl .enabled by SomePackage, disable with -DTPL_ENABLE_HeadersAndLibsTpl=OFF."
Expand All @@ -595,7 +595,7 @@ create_process_enabled_tpls_test_case(
INCLUDE_DIRS ${HeadersAndLibsTpl_BASE_DIR}/include
LIBRARY_DIRS ${HeadersAndLibsTpl_BASE_DIR}/lib
EXTRA_ARGS -DHeadersAndLibsTpl_LIBRARY_NAMES="haltpl2,badlibname"
-DTPL_HeadersAndLibsTpl_ENABLING_PKG=SomePackage
-DHeadersAndLibsTpl_ENABLING_PKG=SomePackage
-DNOT_MUST_FIND_ALL_LIBS=ON
-D${MOCK_PROJECT_NAME}_MUST_FIND_ALL_TPL_LIBS=ON
PASS_REGULAR_EXPRESSION_ALL
Expand Down
24 changes: 23 additions & 1 deletion test/core/TestingFunctionMacro_UnitTests.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ include(TribitsTplFindIncludeDirsAndLibraries)
include(TribitsReportInvalidTribitsUsage)
include(TribitsGitRepoVersionInfo)
include(TribitsDeprecatedHelpers)
include(TribitsCreateReverseList)
include(UnitTestHelpers)
include(GlobalSet)
include(GlobalNullSet)
Expand Down Expand Up @@ -132,6 +133,26 @@ function(unittest_append_string_var)
endfunction()


function(unittest_tribit_create_reverse_list)

message("\n***")
message("*** Testing tribit_create_reverse_list()")
message("***\n")

message("tribit_create_reverse_list() with empty list")
set(someEmptyList "")
tribit_create_reverse_list(someEmptyList someEmptyList_reversed)
unittest_compare_const(someEmptyList_reversed "")


message("tribit_create_reverse_list() with non-empty list")
set(someList a b c d)
tribit_create_reverse_list(someList someList_reversed)
unittest_compare_const(someList_reversed "d;c;b;a")

endfunction()


function(unittest_tribits_find_python_interp)

message("\n***")
Expand Down Expand Up @@ -4740,6 +4761,7 @@ message("*** Testing misc TriBITS functions and macros")
message("***\n")

unittest_append_string_var()
unittest_tribit_create_reverse_list()
unittest_tribits_find_python_interp()
unittest_tribits_standardize_abs_paths()
unittest_tribits_dir_is_basedir()
Expand Down Expand Up @@ -4813,4 +4835,4 @@ message("*** Determine final result of all unit tests")
message("***\n")

# Pass in the number of expected tests that must pass!
unittest_final_result(719)
unittest_final_result(721)
4 changes: 3 additions & 1 deletion test/core/TribitsAdjustPackageEnablesHelpers.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,10 @@ macro(unittest_helper_read_and_process_packages)
set_default(${PROJECT_NAME}_ENABLE_ALL_PACKAGES OFF)
set_default(${PROJECT_NAME}_ENABLE_SECONDARY_TESTED_CODE OFF)
set(DO_PROCESS_MPI_ENABLES ON) # Should not be needed but CMake is not working!
set(${PROJECT_NAME}_DEFINED_PACKAGES
${${PROJECT_NAME}_DEFINED_TPLS} ${${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES})
foreach(tribitsPkg ${${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES})
global_set(${tribitsPkg}_FULL_ENABLED_DEP_PACKAGES)
global_set(${tribitsPkg}_FULL_ENABLED_DEP_PACKAGES "")
endforeach()
tribits_print_enables_before_adjust_package_enables()
tribits_adjust_package_enables(TRUE)
Expand Down
8 changes: 1 addition & 7 deletions test/core/TribitsProcessPackagesAndDirsLists_UnitTests.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,6 @@ function(unittest_basic_package_list_read)
"Package0;Package1;Package2")
unittest_compare_const( ${PROJECT_NAME}_NUM_DEFINED_INTERNAL_TOPLEVEL_PACKAGES 3 )
unittest_compare_const( ${PROJECT_NAME}_LAST_DEFINED_INTERNAL_TOPLEVEL_PACKAGE_IDX 2 )
unittest_compare_const( ${PROJECT_NAME}_REVERSE_DEFINED_INTERNAL_TOPLEVEL_PACKAGES
"Package2;Package1;Package0")
unittest_compare_const( Package0_SOURCE_DIR ${PROJECT_SOURCE_DIR}/packages/package0 )
unittest_compare_const( Package1_SOURCE_DIR ${PROJECT_SOURCE_DIR}/packages/package1 )
unittest_compare_const( Package2_SOURCE_DIR ${PROJECT_SOURCE_DIR}/packages/package2 )
Expand Down Expand Up @@ -123,8 +121,6 @@ function(unittest_basic_package_list_read_abs_pacakge_dir)
"Package0;Package1;Package2")
unittest_compare_const( ${PROJECT_NAME}_NUM_DEFINED_INTERNAL_TOPLEVEL_PACKAGES 3 )
unittest_compare_const( ${PROJECT_NAME}_LAST_DEFINED_INTERNAL_TOPLEVEL_PACKAGE_IDX 2 )
unittest_compare_const( ${PROJECT_NAME}_REVERSE_DEFINED_INTERNAL_TOPLEVEL_PACKAGES
"Package2;Package1;Package0")
unittest_compare_const( Package0_TESTGROUP PT)
unittest_compare_const( Package1_TESTGROUP ST)
unittest_compare_const( Package2_TESTGROUP EX)
Expand Down Expand Up @@ -153,8 +149,6 @@ function(unittest_basic_package_list_read_ps_ss_backward_compatible)
"Package0;Package1;Package2")
unittest_compare_const( ${PROJECT_NAME}_NUM_DEFINED_INTERNAL_TOPLEVEL_PACKAGES 3 )
unittest_compare_const( ${PROJECT_NAME}_LAST_DEFINED_INTERNAL_TOPLEVEL_PACKAGE_IDX 2 )
unittest_compare_const( ${PROJECT_NAME}_REVERSE_DEFINED_INTERNAL_TOPLEVEL_PACKAGES
"Package2;Package1;Package0")
unittest_compare_const( Package0_TESTGROUP PT)
unittest_compare_const( Package1_TESTGROUP ST)
unittest_compare_const( Package2_TESTGROUP EX)
Expand Down Expand Up @@ -236,4 +230,4 @@ unittest_elevate_st_to_pt()
unittest_elevate_ss_to_ps_backward_compatible()

# Pass in the number of expected tests that must pass!
unittest_final_result(34)
unittest_final_result(31)
2 changes: 1 addition & 1 deletion test/ctest_driver/MockCTestDriver/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ create_ctest_dependency_handling_test_case(
PASS_REGULAR_EXPRESSION_ALL
"Explicitly enabled top-level packages on input .by user.: Teuchos 1"
"Explicitly disabled external packages/TPLs on input .by user or by default.: BLAS 1"
"NOTE: Setting Trilinos_ENABLE_Teuchos=OFF which was 'ON' because Teuchos has a required library dependence on disabled TPL BLAS but Trilinos_DISABLE_ENABLED_FORWARD_DEP_PACKAGES=ON!"
"NOTE: Setting Trilinos_ENABLE_Teuchos=OFF which was 'ON' because Teuchos has a required library dependence on disabled package BLAS but Trilinos_DISABLE_ENABLED_FORWARD_DEP_PACKAGES=ON!"
"Final set of enabled top-level packages: 0"
"Trilinos_NUM_ENABLED_INTERNAL_TOPLEVEL_PACKAGES=0: Exiting the script!"
)
Expand Down
14 changes: 13 additions & 1 deletion tribits/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,18 @@
ChangeLog for TriBITS
----------------------------------------

## 2022-10-20:

* **Changed:** Disabling an external package/TPL will now disable any
downstream external packages/TPLs that list a dependency on that external
package/TPL through its
[`FindTPL<tplName>Dependencies.cmake`](https://tribitspub.github.io/TriBITS/users_guide/index.html#findtpl-tplname-dependencies-cmake)
file. Prior to this, disabling an external package/TPL would not disable
dependent downstream external packages/TPLs (it would only disable
downstream dependent required internal packages). To avoid this, simply
leave the enable status of the upstream external package/TPL empty "" and no
downstream propagation of disables will take place.

## 2022-10-16:

* **Removed:** Removed the variables `<Project>_LIBRARY_DIRS`,
Expand Down Expand Up @@ -35,7 +47,7 @@ ChangeLog for TriBITS
default, set `<Project>_ASSERT_DEFINED_DEPENDENCIES_DEFAULT` to `WARNING`,
for example, in the project's `ProjectName.cmake` file.

* **Removed:* `<Project>_ASSERT_MISSING_PACKAGES` has been removed and setting
* **Removed:** `<Project>_ASSERT_MISSING_PACKAGES` has been removed and setting
it will result in a `FATAL_ERROR`. Instead, use
`<Project>_ASSERT_DEFINED_DEPENDENCIES` (and make sure all of your project's
listed TPL dependencies are all defined within the project).
Expand Down
Loading

0 comments on commit bcfeeb1

Please sign in to comment.