diff --git a/config/cmake/MFEMConfig.cmake.in b/config/cmake/MFEMConfig.cmake.in index cbe963041d..f8ab8215a1 100644 --- a/config/cmake/MFEMConfig.cmake.in +++ b/config/cmake/MFEMConfig.cmake.in @@ -109,6 +109,10 @@ if (MFEM_USE_RAJA) find_dependency(RAJA) endif() +if (MFEM_USE_UMPIRE) + find_dependency(umpire) +endif() + if (NOT TARGET mfem) include(${CMAKE_CURRENT_LIST_DIR}/MFEMTargets.cmake) endif (NOT TARGET mfem) diff --git a/config/cmake/modules/FindUMPIRE.cmake b/config/cmake/modules/FindUMPIRE.cmake index b2a1aa705f..1c8d609487 100644 --- a/config/cmake/modules/FindUMPIRE.cmake +++ b/config/cmake/modules/FindUMPIRE.cmake @@ -14,12 +14,12 @@ # - UMPIRE_LIBRARIES # - UMPIRE_INCLUDE_DIRS -if (NOT umpire_DIR AND UMPIRE_DIR) - set(umpire_DIR ${UMPIRE_DIR}/lib/cmake/umpire) +if (NOT umpire_ROOT AND UMPIRE_DIR) + set(umpire_ROOT ${UMPIRE_DIR}) endif() message(STATUS "Looking for UMPIRE ...") message(STATUS " in UMPIRE_DIR = ${UMPIRE_DIR}") -message(STATUS " umpire_DIR = ${umpire_DIR}") +message(STATUS " umpire_ROOT = ${umpire_ROOT}") find_package(umpire CONFIG) set(UMPIRE_FOUND ${umpire_FOUND}) set(UMPIRE_LIBRARIES "umpire")