You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by we...@apache.org on 2017/02/25 20:29:37 UTC
arrow git commit: ARROW-580: C++: Also provide jemalloc_X targets if
only a static or shared version is found
Repository: arrow
Updated Branches:
refs/heads/master d28f1c1e0 -> 89dc55789
ARROW-580: C++: Also provide jemalloc_X targets if only a static or shared version is found
Author: Uwe L. Korn <uw...@xhochy.com>
Closes #349 from xhochy/ARROW-580 and squashes the following commits:
6cdeef2 [Uwe L. Korn] ARROW-580: C++: Also provide jemalloc_X targets if only a static or shared version is found
Project: http://git-wip-us.apache.org/repos/asf/arrow/repo
Commit: http://git-wip-us.apache.org/repos/asf/arrow/commit/89dc5578
Tree: http://git-wip-us.apache.org/repos/asf/arrow/tree/89dc5578
Diff: http://git-wip-us.apache.org/repos/asf/arrow/diff/89dc5578
Branch: refs/heads/master
Commit: 89dc55789b895653ba8184f462c88588928aee15
Parents: d28f1c1
Author: Uwe L. Korn <uw...@xhochy.com>
Authored: Sat Feb 25 15:29:30 2017 -0500
Committer: Wes McKinney <we...@twosigma.com>
Committed: Sat Feb 25 15:29:30 2017 -0500
----------------------------------------------------------------------
cpp/CMakeLists.txt | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/arrow/blob/89dc5578/cpp/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
index b77f8c7..06a1892 100644
--- a/cpp/CMakeLists.txt
+++ b/cpp/CMakeLists.txt
@@ -369,11 +369,19 @@ function(ADD_THIRDPARTY_LIB LIB_NAME)
add_library(${LIB_NAME} STATIC IMPORTED)
set_target_properties(${LIB_NAME}
PROPERTIES IMPORTED_LOCATION "${ARG_STATIC_LIB}")
+ SET(AUG_LIB_NAME "${LIB_NAME}_static")
+ add_library(${AUG_LIB_NAME} STATIC IMPORTED)
+ set_target_properties(${AUG_LIB_NAME}
+ PROPERTIES IMPORTED_LOCATION "${ARG_STATIC_LIB}")
message("Added static library dependency ${LIB_NAME}: ${ARG_STATIC_LIB}")
elseif(ARG_SHARED_LIB)
add_library(${LIB_NAME} SHARED IMPORTED)
set_target_properties(${LIB_NAME}
PROPERTIES IMPORTED_LOCATION "${ARG_SHARED_LIB}")
+ SET(AUG_LIB_NAME "${LIB_NAME}_shared")
+ add_library(${AUG_LIB_NAME} SHARED IMPORTED)
+ set_target_properties(${AUG_LIB_NAME}
+ PROPERTIES IMPORTED_LOCATION "${ARG_SHARED_LIB}")
message("Added shared library dependency ${LIB_NAME}: ${ARG_SHARED_LIB}")
else()
message(FATAL_ERROR "No static or shared library provided for ${LIB_NAME}")