Skip to content

Commit 18ea19f

Browse files
committed
Remove all CMake code around checking deprecated packages
Signed-off-by: Samuel E. Browne <[email protected]>
1 parent 34a202a commit 18ea19f

File tree

2 files changed

+0
-41
lines changed

2 files changed

+0
-41
lines changed

CMakeLists.txt

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,6 @@ PROJECT(${PROJECT_NAME} NONE)
1717
# Set up to use ccache
1818
include("${CMAKE_CURRENT_LIST_DIR}/cmake/UseCCache.cmake")
1919

20-
set(DEPRECATED_PACKAGES Amesos AztecOO Epetra EpetraExt Ifpack Intrepid Isorropia ML NewPackage Pliris PyTrilinos ShyLU_DDCore ThyraEpetraAdapters ThyraEpetraExtAdapters Triutils)
21-
FOREACH(package ${DEPRECATED_PACKAGES})
22-
set(${package}_DISABLE_STRONG_WARNINGS ON CACHE BOOL "Disable strong compile warnings for ${package}" FORCE)
23-
ENDFOREACH()
24-
2520
# Set an env so we know we are in configure
2621
set(ENV{CMAKE_IS_IN_CONFIGURE_MODE} 1)
2722

@@ -61,30 +56,4 @@ IF(${PROJECT_NAME}_ENABLE_YouCompleteMe)
6156
INCLUDE(CodeCompletion)
6257
ENDIF()
6358

64-
set(enabled_deprecated_packages "")
65-
FOREACH(package ${DEPRECATED_PACKAGES})
66-
IF(Trilinos_ENABLE_${package})
67-
set(enabled_deprecated_packages ${package} ${enabled_deprecated_packages})
68-
ENDIF()
69-
ENDFOREACH()
70-
71-
IF(enabled_deprecated_packages)
72-
message("********************************************************************")
73-
message("******** WARNING WARNING WARNING WARNING WARNING WARNING *********")
74-
message("********************************************************************")
75-
message("* Several Trilinos packages are scheduled for deprecation in 2025.")
76-
message("* The following deprecated packages are enabled (either explicitly")
77-
message("* or implicitly due to a dependency)")
78-
message("*")
79-
string(REPLACE ";" "\n* " p "${enabled_deprecated_packages}")
80-
message("* ${p}")
81-
message("*")
82-
message("********************************************************************")
83-
message("")
84-
message(WARNING "Deprecated packages that are enabled: ${enabled_deprecated_packages}")
85-
IF(Trilinos_HIDE_DEPRECATED_CODE)
86-
message(FATAL_ERROR "Trilinos cannot be built with deprecated code hidden if any deprecated packages are enabled!")
87-
ENDIF()
88-
ENDIF()
89-
9059
message(STATUS "If publishing results using Trilinos, please cite us: https://trilinos.github.io/cite.html")

cmake/ProjectCompilerPostConfig.cmake

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,6 @@
11
tribits_get_package_enable_status(Kokkos KokkosEnable "")
22

33

4-
macro(disable_warnings_for_deprecated_packages)
5-
message(STATUS "Disabling all warnings/errors for deprecated packages")
6-
foreach(package ${DEPRECATED_PACKAGES})
7-
set(${package}_CXX_FLAGS "-w ${${package}_CXX_FLAGS}")
8-
endforeach()
9-
endmacro()
10-
11-
124
macro(enable_warnings warnings)
135
message(STATUS "Trilinos warnings enabled: ${warnings}")
146
foreach(warning ${warnings})
@@ -211,12 +203,10 @@ if("${Trilinos_WARNINGS_MODE}" STREQUAL "WARN")
211203
enable_warnings("${upcoming_warnings}")
212204
filter_valid_warnings_as_errors("${promoted_warnings}" promoted_warnings)
213205
enable_errors("${promoted_warnings}")
214-
disable_warnings_for_deprecated_packages()
215206
elseif("${Trilinos_WARNINGS_MODE}" STREQUAL "ERROR")
216207
filter_valid_warnings_as_errors("${promoted_warnings}" promoted_warnings)
217208
filter_valid_warnings_as_errors("${upcoming_warnings}" upcoming_warnings)
218209
enable_errors("${promoted_warnings};${upcoming_warnings}")
219-
disable_warnings_for_deprecated_packages()
220210
endif()
221211

222212
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")

0 commit comments

Comments
 (0)