You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by uw...@apache.org on 2019/02/15 17:25:29 UTC
[arrow] branch master updated: ARROW-4577: [C++] Don't set interface link libs on arrow_shared where there are none
This is an automated email from the ASF dual-hosted git repository.
uwe 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 524a9dc ARROW-4577: [C++] Don't set interface link libs on arrow_shared where there are none
524a9dc is described below
commit 524a9dc79556a15d1f56c094913f0e0682358844
Author: Uwe L. Korn <uw...@xhochy.com>
AuthorDate: Fri Feb 15 18:25:15 2019 +0100
ARROW-4577: [C++] Don't set interface link libs on arrow_shared where there are none
Author: Uwe L. Korn <uw...@xhochy.com>
Closes #3652 from xhochy/ARROW-4577 and squashes the following commits:
e9d6b14c <Uwe L. Korn> ARROW-4577: Don't set interface link libs on arrow_shared where there are none
---
cpp/CMakeLists.txt | 1 -
cpp/cmake_modules/BuildUtils.cmake | 8 +-------
2 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
index 17582c9..7d1fee0 100644
--- a/cpp/CMakeLists.txt
+++ b/cpp/CMakeLists.txt
@@ -844,7 +844,6 @@ endif()
list(APPEND ARROW_LINK_LIBS ${ARROW_SYSTEM_LINK_LIBS})
list(APPEND ARROW_STATIC_LINK_LIBS ${ARROW_SYSTEM_LINK_LIBS})
-list(APPEND ARROW_SHARED_INSTALL_INTERFACE_LIBS ${ARROW_SYSTEM_LINK_LIBS})
list(APPEND ARROW_STATIC_INSTALL_INTERFACE_LIBS ${ARROW_SYSTEM_LINK_LIBS})
#
diff --git a/cpp/cmake_modules/BuildUtils.cmake b/cpp/cmake_modules/BuildUtils.cmake
index 1591d86..5a0f2b8 100644
--- a/cpp/cmake_modules/BuildUtils.cmake
+++ b/cpp/cmake_modules/BuildUtils.cmake
@@ -206,16 +206,10 @@ function(ADD_ARROW_LIB LIB_NAME)
VERSION "${ARROW_FULL_SO_VERSION}"
SOVERSION "${ARROW_SO_VERSION}")
- if (ARG_SHARED_INSTALL_INTERFACE_LIBS)
- set(INTERFACE_LIBS ${ARG_SHARED_INSTALL_INTERFACE_LIBS})
- else()
- set(INTERFACE_LIBS ${ARG_SHARED_LINK_LIBS})
- endif()
-
target_link_libraries(${LIB_NAME}_shared
LINK_PUBLIC
"$<BUILD_INTERFACE:${ARG_SHARED_LINK_LIBS}>"
- "$<INSTALL_INTERFACE:${INTERFACE_LIBS}>"
+ "$<INSTALL_INTERFACE:${ARG_SHARED_INSTALL_INTERFACE_LIBS}>"
LINK_PRIVATE ${ARG_SHARED_PRIVATE_LINK_LIBS})
if (ARROW_RPATH_ORIGIN)