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 2022/06/16 04:38:29 UTC
[arrow] branch master updated: ARROW-16751: [C++] Fix ucx target error on cmake3.5 (#13389)
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 6c135b353e ARROW-16751: [C++] Fix ucx target error on cmake3.5 (#13389)
6c135b353e is described below
commit 6c135b353e4d73abb2c0687b53bc230f31f4108d
Author: Yibo Cai <yi...@arm.com>
AuthorDate: Thu Jun 16 12:38:21 2022 +0800
ARROW-16751: [C++] Fix ucx target error on cmake3.5 (#13389)
Authored-by: Yibo Cai <yi...@arm.com>
Signed-off-by: Sutou Kouhei <ko...@clear-code.com>
---
cpp/cmake_modules/ThirdpartyToolchain.cmake | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake
index 024859288b..d57055f0ea 100644
--- a/cpp/cmake_modules/ThirdpartyToolchain.cmake
+++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake
@@ -4718,8 +4718,15 @@ endmacro()
if(ARROW_WITH_UCX)
resolve_dependency(ucx PC_PACKAGE_NAMES ucx)
add_library(ucx::ucx INTERFACE IMPORTED)
- target_include_directories(ucx::ucx INTERFACE "${UCX_INCLUDE_DIRS}")
- target_link_libraries(ucx::ucx INTERFACE ucx::ucp ucx::uct ucx::ucs)
+ if(CMAKE_VERSION VERSION_LESS 3.11)
+ set_target_properties(ucx::ucx PROPERTIES INTERFACE_INCLUDE_DIRECTORIES
+ "${UCX_INCLUDE_DIRS}")
+ set_property(TARGET ucx::ucx PROPERTY INTERFACE_LINK_LIBRARIES ucx::ucp ucx::uct
+ ucx::ucs)
+ else()
+ target_include_directories(ucx::ucx INTERFACE "${UCX_INCLUDE_DIRS}")
+ target_link_libraries(ucx::ucx INTERFACE ucx::ucp ucx::uct ucx::ucs)
+ endif()
endif()
message(STATUS "All bundled static libraries: ${ARROW_BUNDLED_STATIC_LIBS}")