Skip to content

Commit 29d7242

Browse files
committed
Force-disable all deprecated packages
Set TriBITS variables for dependencies on deprecated packages to be `OFF` to get around any `assert_defined(<packageName>_ENABLE_<deprecatedPackageName>)` statements lying around in non-deprecated packages. Also set the global enables (e.g. `Trilinos_ENABLE_<deprecatedPackageName>`) in case packages are using them either. Signed-off-by: Samuel E. Browne <[email protected]>
1 parent a2ed4af commit 29d7242

File tree

1 file changed

+15
-0
lines changed

1 file changed

+15
-0
lines changed

cmake/ProjectCompilerPostConfig.cmake

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,3 +197,18 @@ endif()
197197
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
198198
disable_warnings("${explicitly_disabled_warnings}")
199199
endif()
200+
201+
202+
# Make sure that all deprecated packages are forcefully disabled (and that the variables controlling enablement are defined)
203+
macro(force_disable_package packageName)
204+
tribits_filter_package_list_from_var(Trilinos_DEFINED_PACKAGES INTERNAL ON NONEMPTY packageSublist)
205+
set(Trilinos_ENABLE_${packageName} OFF CACHE BOOL "Enable ${packageName} (special setting for force-disable, should ALWAYS be `OFF`)")
206+
foreach(package ${packageSublist})
207+
set(${package}_ENABLE_${packageName} OFF CACHE BOOL "Enable ${packageName} support in ${package} (special setting for force-disable, should ALWAYS be `OFF`)")
208+
endforeach()
209+
endmacro()
210+
211+
set(DEPRECATED_PACKAGES Amesos AztecOO Epetra EpetraExt Ifpack Intrepid Isorropia ML NewPackage Pliris PyTrilinos ShyLU_DDCore ThyraEpetraAdapters ThyraEpetraExtAdapters Triutils)
212+
FOREACH(package ${DEPRECATED_PACKAGES})
213+
force_disable_package(${package})
214+
ENDFOREACH()

0 commit comments

Comments
 (0)