From: Matthias Maier Date: Mon, 12 May 2025 16:15:16 +0000 (-0500) Subject: CMake: do not FATAL_ERROR when ArborX version is out of range X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f1a4db3f17a1fb923f03041f4f83f381e9a037b;p=dealii.git CMake: do not FATAL_ERROR when ArborX version is out of range --- diff --git a/cmake/modules/FindDEAL_II_ARBORX.cmake b/cmake/modules/FindDEAL_II_ARBORX.cmake index bd8c877a96..01dd55db86 100644 --- a/cmake/modules/FindDEAL_II_ARBORX.cmake +++ b/cmake/modules/FindDEAL_II_ARBORX.cmake @@ -31,20 +31,25 @@ find_package(ArborX QUIET HINTS ${ARBORX_DIR} ${ArborX_DIR} $ENV{ArborX_DIR} ) +# +# ArborX's compatibility mode is set to SameMajorVersion. Therefore if we +# want to support both the 1.X and the 2.X, we cannot set a minimum +# version in find_package. Instead we need to check the minimum version +# ourselves. +# if(ArborX_FOUND) - get_property(ARBORX_INSTALL_INCLUDE_DIR TARGET ArborX::ArborX PROPERTY INTERFACE_INCLUDE_DIRECTORIES) - - # - # ArborX's compatibility mode is set to SameMajorVersion. Therefore if we want to - # support both the 1.X and the 2.X, we cannot set a minimum version in - # find_package. Instead we need to check the minimum version ourselves. - # if(ArborX_VERSION VERSION_LESS 1.3) - message(FATAL_ERROR "Found ArborX version ${ArborX_VERSION} but the minimum version supported is 1.3") + message(STATUS "Found ArborX version ${ArborX_VERSION} but the minimum version supported is 1.3") + unset(ArborX_FOUND) elseif(ArborX_VERSION VERSION_GREATER_EQUAL 2.0) - message(FATAL_ERROR "Found ArborX version ${ArborX_VERSION}. The 2.X series is not currently supported") + message(STATUS "Found ArborX version ${ArborX_VERSION}. The 2.X series is not currently supported") + unset(ArborX_FOUND) endif() +endif() + +if(ArborX_FOUND) + get_property(ARBORX_INSTALL_INCLUDE_DIR TARGET ArborX::ArborX PROPERTY INTERFACE_INCLUDE_DIRECTORIES) # # Check whether ArborX was compiled with MPI support