Skip to content

Commit bf7c58f

Browse files
Bring back deprecated <Project>_ASSERT_MISSING_PACKAGES (trilinos/Trilinos#11429)
I also added a test to make sure it should at least for the case <Project>_ASSERT_MISSING_PACKAGES=ON. For the case 'OFF', it just sets INGORE by default (and should be correct by simple inspection). See new CHANGLOG entry.
1 parent 6d68c89 commit bf7c58f

File tree

3 files changed

+40
-7
lines changed

3 files changed

+40
-7
lines changed

test/core/DependencyUnitTests/CMakeLists.txt

+18
Original file line numberDiff line numberDiff line change
@@ -1478,6 +1478,24 @@ create_dependency_handling_test_case(
14781478
)
14791479

14801480

1481+
create_dependency_handling_test_case(
1482+
preCopyrightTrilinos_ShowInvalidPackageNameAndTplNameError_AssertMissingPackagesOn
1483+
ARGS
1484+
-DSHOW_INVALID_PACKAGE_NAME_ERROR=ON
1485+
-DSHOW_INVALID_TPL_NAME_ERROR=ON
1486+
-DTrilinos_ASSERT_MISSING_PACKAGES=ON
1487+
PASS_REGULAR_EXPRESSION_ALL
1488+
"CMake Deprecation Warning at .*/MessageWrapper.cmake:.+ [(]message[)]:"
1489+
" Warning, Trilinos_ASSERT_MISSING_PACKAGES='ON' is set and is no longer"
1490+
" supported! Please set Trilinos_ASSERT_DEFINED_DEPENDENCIES instead [(]see"
1491+
" build ref[)]!"
1492+
"CMake Error at .*/TribitsReadDepsFilesCreateDepsGraph.cmake:.+ [(]message[)]:"
1493+
"Error, the package 'Zlib' is listed as a dependency of the package 'Zoltan'"
1494+
"ignore/disable the undefined package 'Zlib', set the cache variable"
1495+
"Trilinos_ASSERT_DEFINED_DEPENDENCIES=IGNORE[.]"
1496+
)
1497+
1498+
14811499
create_dependency_handling_test_case(
14821500
preCopyrightTrilinos_ShowInvalidPackageSelfDependency
14831501
ARGS -DTrilinos_EXTRA_REPOSITORIES=preCopyrightTrilinos

tribits/CHANGELOG.md

+9
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,15 @@
22
ChangeLog for TriBITS
33
----------------------------------------
44

5+
## 2023-01-10:
6+
7+
* **Added:** Added back support for deprecated variable
8+
`<Project>_ASSERT_MISSING_PACKAGES` that was removed
9+
[2022-10-11](#2022-10-11). When `<Project>_ASSERT_MISSING_PACKAGES` is set
10+
to a non-null value, it overrides the default value for
11+
`<Project>_ASSERT_DEFINED_DEPENDENCIES` (but setting
12+
`<Project>_ASSERT_DEFINED_DEPENDENCIES` in the cache takes precedence).
13+
514
## 2023-01-06:
615

716
* **Changed:** Changed all TPL dependencies back to 'Optional' so that

tribits/core/package_arch/TribitsGlobalMacros.cmake

+13-7
Original file line numberDiff line numberDiff line change
@@ -720,13 +720,26 @@ macro(tribits_define_global_options_and_define_extra_repos)
720720
"Determines if a variety of development mode checks are turned on by default or not."
721721
)
722722

723+
if (NOT "${${PROJECT_NAME}_ASSERT_MISSING_PACKAGES}" STREQUAL "")
724+
tribits_deprecated("Warning, ${PROJECT_NAME}_ASSERT_MISSING_PACKAGES="
725+
"'${${PROJECT_NAME}_ASSERT_MISSING_PACKAGES}' is set and is no"
726+
" longer supported! Please set"
727+
" ${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES instead (see build ref)!" )
728+
if (${PROJECT_NAME}_ASSERT_MISSING_PACKAGES)
729+
set(${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES_DEFAULT FATAL_ERROR)
730+
else()
731+
set(${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES_DEFAULT IGNORE)
732+
endif()
733+
endif()
734+
723735
if ("${${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES_DEFAULT}" STREQUAL "")
724736
if (${PROJECT_NAME}_ENABLE_DEVELOPMENT_MODE)
725737
set(${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES_DEFAULT FATAL_ERROR)
726738
else()
727739
set(${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES_DEFAULT IGNORE)
728740
endif()
729741
endif()
742+
730743
set(${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES_ERROR_VALUES_LIST
731744
"FATAL_ERROR" "SEND_ERROR" )
732745
set(${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES_VALUES_LIST
@@ -740,13 +753,6 @@ macro(tribits_define_global_options_and_define_extra_repos)
740753
${${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES_VALUES_LIST}
741754
IS_ADVANCED )
742755

743-
if (NOT "${${PROJECT_NAME}_ASSERT_MISSING_PACKAGES}" STREQUAL "")
744-
message(FATAL_ERROR "Error, ${PROJECT_NAME}_ASSERT_MISSING_PACKAGES="
745-
" '${${PROJECT_NAME}_ASSERT_MISSING_PACKAGES}' is set and is no"
746-
" longer supported! Please set"
747-
" ${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES=FATAL_ERROR instead!" )
748-
endif()
749-
750756
if ("${${PROJECT_NAME}_ASSERT_CORRECT_TRIBITS_USAGE_DEFAULT}" STREQUAL "")
751757
if (${PROJECT_NAME}_ENABLE_DEVELOPMENT_MODE)
752758
set(${PROJECT_NAME}_ASSERT_CORRECT_TRIBITS_USAGE_DEFAULT FATAL_ERROR)

0 commit comments

Comments
 (0)