Skip to content

Commit 04d2403

Browse files
authored
ARROW-17511: [C++] Add support for xsimd 9.0.0 (#13958)
Authored-by: Sutou Kouhei <[email protected]> Signed-off-by: Sutou Kouhei <[email protected]>
1 parent f9c469d commit 04d2403

1 file changed

Lines changed: 27 additions & 4 deletions

File tree

‎cpp/cmake_modules/ThirdpartyToolchain.cmake‎

Lines changed: 27 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,12 @@ endmacro()
227227

228228
macro(resolve_dependency DEPENDENCY_NAME)
229229
set(options)
230-
set(one_value_args HAVE_ALT IS_RUNTIME_DEPENDENCY REQUIRED_VERSION USE_CONFIG)
230+
set(one_value_args
231+
FORCE_ANY_NEWER_VERSION
232+
HAVE_ALT
233+
IS_RUNTIME_DEPENDENCY
234+
REQUIRED_VERSION
235+
USE_CONFIG)
231236
set(multi_value_args COMPONENTS PC_PACKAGE_NAMES)
232237
cmake_parse_arguments(ARG
233238
"${options}"
@@ -247,7 +252,7 @@ macro(resolve_dependency DEPENDENCY_NAME)
247252
set(PACKAGE_NAME ${DEPENDENCY_NAME})
248253
endif()
249254
set(FIND_PACKAGE_ARGUMENTS ${PACKAGE_NAME})
250-
if(ARG_REQUIRED_VERSION)
255+
if(ARG_REQUIRED_VERSION AND NOT ARG_FORCE_ANY_NEWER_VERSION)
251256
list(APPEND FIND_PACKAGE_ARGUMENTS ${ARG_REQUIRED_VERSION})
252257
endif()
253258
if(ARG_USE_CONFIG)
@@ -258,7 +263,16 @@ macro(resolve_dependency DEPENDENCY_NAME)
258263
endif()
259264
if(${DEPENDENCY_NAME}_SOURCE STREQUAL "AUTO")
260265
find_package(${FIND_PACKAGE_ARGUMENTS})
261-
if(${${PACKAGE_NAME}_FOUND})
266+
set(COMPATIBLE ${${PACKAGE_NAME}_FOUND})
267+
if(COMPATIBLE
268+
AND ARG_FORCE_ANY_NEWER_VERSION
269+
AND ARG_REQUIRED_VERSION)
270+
if(${${PACKAGE_NAME}_VERSION} VERSION_LESS ${ARG_REQUIRED_VERSION})
271+
message(DEBUG "Couldn't find ${DEPENDENCY_NAME} >= ${ARG_REQUIRED_VERSION}")
272+
set(COMPATIBLE FALSE)
273+
endif()
274+
endif()
275+
if(COMPATIBLE)
262276
set(${DEPENDENCY_NAME}_SOURCE "SYSTEM")
263277
else()
264278
build_dependency(${DEPENDENCY_NAME})
@@ -268,6 +282,11 @@ macro(resolve_dependency DEPENDENCY_NAME)
268282
build_dependency(${DEPENDENCY_NAME})
269283
elseif(${DEPENDENCY_NAME}_SOURCE STREQUAL "SYSTEM")
270284
find_package(${FIND_PACKAGE_ARGUMENTS} REQUIRED)
285+
if(ARG_FORCE_ANY_NEWER_VERSION AND ARG_REQUIRED_VERSION)
286+
if(${${PACKAGE_NAME}_VERSION} VERSION_LESS ${ARG_REQUIRED_VERSION})
287+
message(FATAL_ERROR "Couldn't find ${DEPENDENCY_NAME} >= ${ARG_REQUIRED_VERSION}")
288+
endif()
289+
endif()
271290
endif()
272291
if(${DEPENDENCY_NAME}_SOURCE STREQUAL "SYSTEM" AND ARG_IS_RUNTIME_DEPENDENCY)
273292
provide_find_module(${PACKAGE_NAME})
@@ -2253,7 +2272,11 @@ else()
22532272
endif()
22542273

22552274
if(ARROW_USE_XSIMD)
2256-
resolve_dependency(xsimd REQUIRED_VERSION "8.1.0")
2275+
resolve_dependency(xsimd
2276+
REQUIRED_VERSION
2277+
"8.1.0"
2278+
FORCE_ANY_NEWER_VERSION
2279+
TRUE)
22572280

22582281
if(xsimd_SOURCE STREQUAL "BUNDLED")
22592282
add_library(xsimd INTERFACE IMPORTED)

0 commit comments

Comments
 (0)