You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by ko...@apache.org on 2023/01/21 06:51:42 UTC
[arrow] branch master updated: GH-33786: [C++] Ignore old system xsimd (#33811)
This is an automated email from the ASF dual-hosted git repository.
kou pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/master by this push:
new 2117d02869 GH-33786: [C++] Ignore old system xsimd (#33811)
2117d02869 is described below
commit 2117d028699edd9f4197650890f3226cdd285c23
Author: Sutou Kouhei <ko...@clear-code.com>
AuthorDate: Sat Jan 21 15:51:35 2023 +0900
GH-33786: [C++] Ignore old system xsimd (#33811)
### Rationale for this change
If old xsimd is installed, CMake target for bundled xsimd is conflicted.
### What changes are included in this PR?
Use `arrow::xsimd` for bundled xsimd's target name to avoid conflict.
### Are these changes tested?
Yes.
### Are there any user-facing changes?
No.
* Closes: #33786
Authored-by: Sutou Kouhei <ko...@clear-code.com>
Signed-off-by: Sutou Kouhei <ko...@clear-code.com>
---
cpp/CMakeLists.txt | 4 ++--
cpp/cmake_modules/ThirdpartyToolchain.cmake | 10 ++++++----
dev/release/setup-ubuntu.sh | 1 +
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
index 8398a394e7..b193ea80d4 100644
--- a/cpp/CMakeLists.txt
+++ b/cpp/CMakeLists.txt
@@ -798,8 +798,8 @@ if(ARROW_WITH_RAPIDJSON)
endif()
if(ARROW_USE_XSIMD)
- list(APPEND ARROW_SHARED_LINK_LIBS xsimd)
- list(APPEND ARROW_STATIC_LINK_LIBS xsimd)
+ list(APPEND ARROW_SHARED_LINK_LIBS ${ARROW_XSIMD})
+ list(APPEND ARROW_STATIC_LINK_LIBS ${ARROW_XSIMD})
endif()
add_custom_target(arrow_dependencies)
diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake
index 39044f956a..490cb09fe8 100644
--- a/cpp/cmake_modules/ThirdpartyToolchain.cmake
+++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake
@@ -2292,15 +2292,17 @@ if(ARROW_USE_XSIMD)
TRUE)
if(xsimd_SOURCE STREQUAL "BUNDLED")
- add_library(xsimd INTERFACE IMPORTED)
+ add_library(arrow::xsimd INTERFACE IMPORTED)
if(CMAKE_VERSION VERSION_LESS 3.11)
- set_target_properties(xsimd PROPERTIES INTERFACE_INCLUDE_DIRECTORIES
- "${XSIMD_INCLUDE_DIR}")
+ set_target_properties(arrow::xsimd PROPERTIES INTERFACE_INCLUDE_DIRECTORIES
+ "${XSIMD_INCLUDE_DIR}")
else()
- target_include_directories(xsimd INTERFACE "${XSIMD_INCLUDE_DIR}")
+ target_include_directories(arrow::xsimd INTERFACE "${XSIMD_INCLUDE_DIR}")
endif()
+ set(ARROW_XSIMD arrow::xsimd)
else()
message(STATUS "xsimd found. Headers: ${xsimd_INCLUDE_DIRS}")
+ set(ARROW_XSIMD xsimd)
endif()
endif()
diff --git a/dev/release/setup-ubuntu.sh b/dev/release/setup-ubuntu.sh
index 6a55f25e4b..f0cf569aec 100755
--- a/dev/release/setup-ubuntu.sh
+++ b/dev/release/setup-ubuntu.sh
@@ -47,6 +47,7 @@ case ${codename} in
python=3
apt-get update -y -q
apt-get install -y -q --no-install-recommends \
+ libxsimd-dev \
llvm-dev
;;
esac