From: Matthias Maier Date: Wed, 30 Nov 2022 18:45:07 +0000 (-0600) Subject: Merge pull request #14457 from masterleinad/add_kokkos_libraries_to_trilinos X-Git-Tag: v9.5.0-rc1~779 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=34ef6b5b084a2ab99b604e9d615fdaa56895ae53;p=dealii.git Merge pull request #14457 from masterleinad/add_kokkos_libraries_to_trilinos Add Kokkos link libraries to Trilinos link libraries --- 34ef6b5b084a2ab99b604e9d615fdaa56895ae53 diff --cc cmake/modules/FindDEAL_II_TRILINOS.cmake index a230841646,6308045a60..77c82e4153 --- a/cmake/modules/FindDEAL_II_TRILINOS.cmake +++ b/cmake/modules/FindDEAL_II_TRILINOS.cmake @@@ -155,10 -156,10 +156,10 @@@ foreach(_library ${Trilinos_LIBRARIES} endforeach() -deal_ii_package_handle(TRILINOS +process_feature(TRILINOS LIBRARIES REQUIRED ${_libraries} - OPTIONAL Trilinos_TPL_LIBRARIES MPI_CXX_LIBRARIES + OPTIONAL Trilinos_TPL_LIBRARIES MPI_CXX_LIBRARIES KOKKOS_LINK_LIBRARIES INCLUDE_DIRS REQUIRED Trilinos_INCLUDE_DIRS OPTIONAL Trilinos_TPL_INCLUDE_DIRS