@@ -228,7 +228,7 @@ endmacro()
228228macro (resolve_dependency DEPENDENCY_NAME )
229229 set (options)
230230 set (one_value_args HAVE_ALT IS_RUNTIME_DEPENDENCY REQUIRED_VERSION USE_CONFIG)
231- set (multi_value_args COMPONENTS PC_PACKAGE_NAMES)
231+ set (multi_value_args COMPONENTS PC_PACKAGE_NAMES REQUIRED_VERSIONS )
232232 cmake_parse_arguments (ARG
233233 "${options} "
234234 "${one_value_args} "
@@ -246,18 +246,30 @@ macro(resolve_dependency DEPENDENCY_NAME)
246246 else ()
247247 set (PACKAGE_NAME ${DEPENDENCY_NAME} )
248248 endif ()
249- set (FIND_PACKAGE_ARGUMENTS ${PACKAGE_NAME} )
250- if (ARG_REQUIRED_VERSION)
251- list (APPEND FIND_PACKAGE_ARGUMENTS ${ARG_REQUIRED_VERSION} )
252- endif ()
249+ set (FIND_PACKAGE_ARGUMENTS_BEFORE_VERSION ${PACKAGE_NAME} )
250+ set (FIND_PACKAGE_ARGUMENTS_AFTER_VERSION)
253251 if (ARG_USE_CONFIG)
254- list (APPEND FIND_PACKAGE_ARGUMENTS CONFIG)
252+ list (APPEND FIND_PACKAGE_ARGUMENTS_AFTER_VERSION CONFIG)
255253 endif ()
256254 if (ARG_COMPONENTS)
257- list (APPEND FIND_PACKAGE_ARGUMENTS COMPONENTS ${ARG_COMPONENTS} )
255+ list (APPEND FIND_PACKAGE_ARGUMENTS_AFTER_VERSION COMPONENTS ${ARG_COMPONENTS} )
256+ endif ()
257+ if (ARG_REQUIRED_VERSION)
258+ list (APPEND ARG_REQUIRED_VERSIONS ${ARG_REQUIRED_VERSION} )
258259 endif ()
259260 if (${DEPENDENCY_NAME} _SOURCE STREQUAL "AUTO" )
260- find_package (${FIND_PACKAGE_ARGUMENTS} )
261+ if (ARG_REQUIRED_VERSIONS)
262+ foreach (VERSION ${ARG_REQUIRED_VERSIONS} )
263+ find_package (${FIND_PACKAGE_ARGUMENTS_BEFORE_VERSION} ${VERSION}
264+ ${FIND_PACKAGE_ARGUMENTS_AFTER_VERSION} )
265+ if (${${PACKAGE_NAME} _FOUND})
266+ break ()
267+ endif ()
268+ endforeach ()
269+ else ()
270+ find_package (${FIND_PACKAGE_ARGUMENTS_BEFORE_VERSION}
271+ ${FIND_PACKAGE_ARGUMENTS_AFTER_VERSION} )
272+ endif ()
261273 if (${${PACKAGE_NAME} _FOUND})
262274 set (${DEPENDENCY_NAME} _SOURCE "SYSTEM" )
263275 else ()
@@ -267,7 +279,21 @@ macro(resolve_dependency DEPENDENCY_NAME)
267279 elseif (${DEPENDENCY_NAME} _SOURCE STREQUAL "BUNDLED" )
268280 build_dependency (${DEPENDENCY_NAME} )
269281 elseif (${DEPENDENCY_NAME} _SOURCE STREQUAL "SYSTEM" )
270- find_package (${FIND_PACKAGE_ARGUMENTS} REQUIRED )
282+ if (ARG_REQUIRED_VERSIONS)
283+ foreach (VERSION ${ARG_REQUIRED_VERSIONS} )
284+ find_package (${FIND_PACKAGE_ARGUMENTS_BEFORE_VERSION} ${VERSION}
285+ ${FIND_PACKAGE_ARGUMENTS_AFTER_VERSION} )
286+ if (${${PACKAGE_NAME} _FOUND})
287+ break ()
288+ endif ()
289+ endforeach ()
290+ if (NOT ${${PACKAGE_NAME} _FOUND})
291+ message (FATAL_ERROR "Couldn't find ${DEPENDENCY_NAME} " )
292+ endif ()
293+ else ()
294+ find_package (${FIND_PACKAGE_ARGUMENTS_BEFORE_VERSION}
295+ ${FIND_PACKAGE_ARGUMENTS_AFTER_VERSION} REQUIRED )
296+ endif ()
271297 endif ()
272298 if (${DEPENDENCY_NAME} _SOURCE STREQUAL "SYSTEM" AND ARG_IS_RUNTIME_DEPENDENCY)
273299 provide_find_module (${PACKAGE_NAME} )
@@ -2253,7 +2279,7 @@ else()
22532279endif ()
22542280
22552281if (ARROW_USE_XSIMD)
2256- resolve_dependency (xsimd REQUIRED_VERSION "8.1.0" )
2282+ resolve_dependency (xsimd REQUIRED_VERSIONS "9.0.0" "8.1.0" )
22572283
22582284 if (xsimd_SOURCE STREQUAL "BUNDLED" )
22592285 add_library (xsimd INTERFACE IMPORTED )
0 commit comments