From: Timo Heister <timo.heister@gmail.com> Date: Fri, 21 Mar 2025 15:38:47 +0000 (-0400) Subject: also run detection for 13.2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f4314b1cad8a1c772d8aeaba962efa52ab5c116;p=dealii.git also run detection for 13.2 --- diff --git a/cmake/modules/FindDEAL_II_TRILINOS.cmake b/cmake/modules/FindDEAL_II_TRILINOS.cmake index ff6850b3a0..ee375a99a7 100644 --- a/cmake/modules/FindDEAL_II_TRILINOS.cmake +++ b/cmake/modules/FindDEAL_II_TRILINOS.cmake @@ -48,6 +48,16 @@ find_package(TRILINOS_CONFIG ) if(Trilinos_FOUND) + # run find_package to populate variables like Kokkos_VERSION not + # set by the find_package call to Trilinos: + set(CMAKE_CXX_EXTENSIONS OFF) + find_package(Kokkos 3.4.0 QUIET + PATHS ${TRILINOS_DIR} NO_DEFAULT_PATH + ) + + set(KOKKOS_FOUND ${Kokkos_FOUND}) + + # # Extract version numbers: # @@ -114,15 +124,6 @@ if(TRILINOS_VERSION VERSION_GREATER_EQUAL 14) list(APPEND _targets Kokkos::kokkos) endif() - # run find_package to populate variables like Kokkos_VERSION not - # set by the find_package call to Trilinos: - set(CMAKE_CXX_EXTENSIONS OFF) - find_package(Kokkos 3.4.0 QUIET - PATHS ${TRILINOS_DIR} NO_DEFAULT_PATH - ) - - set(KOKKOS_FOUND ${Kokkos_FOUND}) - process_feature(TRILINOS TARGETS REQUIRED _targets CLEAR