You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@parquet.apache.org by we...@apache.org on 2016/06/07 05:54:59 UTC
parquet-cpp git commit: PARQUET-628: Link thrift privately
Repository: parquet-cpp
Updated Branches:
refs/heads/master c2ca2e3e9 -> 9b28c8f21
PARQUET-628: Link thrift privately
Author: Uwe L. Korn <uw...@xhochy.com>
Closes #116 from xhochy/parquet-628 and squashes the following commits:
dbb46e0 [Uwe L. Korn] PARQUET-628: Link thrift privately
Project: http://git-wip-us.apache.org/repos/asf/parquet-cpp/repo
Commit: http://git-wip-us.apache.org/repos/asf/parquet-cpp/commit/9b28c8f2
Tree: http://git-wip-us.apache.org/repos/asf/parquet-cpp/tree/9b28c8f2
Diff: http://git-wip-us.apache.org/repos/asf/parquet-cpp/diff/9b28c8f2
Branch: refs/heads/master
Commit: 9b28c8f215d7f97241b3f07357a1b3571bff1519
Parents: c2ca2e3
Author: Uwe L. Korn <uw...@xhochy.com>
Authored: Mon Jun 6 22:54:53 2016 -0700
Committer: Wes McKinney <we...@apache.org>
Committed: Mon Jun 6 22:54:53 2016 -0700
----------------------------------------------------------------------
CMakeLists.txt | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/9b28c8f2/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2ccbcff..d4cf68f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -461,13 +461,15 @@ set(LIBPARQUET_SRCS
set(LIBPARQUET_LINK_LIBS
parquet_compression
- parquet_thrift
parquet_util
+)
+
+set(LIBPARQUET_PRIVATE_LINK_LIBS
+ parquet_thrift
thriftstatic
)
add_library(parquet_objlib OBJECT
- ${LIBPARQUET_LINKAGE}
${LIBPARQUET_SRCS}
)
@@ -482,7 +484,8 @@ if (PARQUET_BUILD_SHARED)
PROPERTIES
LIBRARY_OUTPUT_DIRECTORY "${BUILD_OUTPUT_ROOT_DIRECTORY}"
OUTPUT_NAME "parquet")
- target_link_libraries(parquet_shared ${LIBPARQUET_LINK_LIBS})
+ target_link_libraries(parquet_shared PUBLIC ${LIBPARQUET_LINK_LIBS})
+ target_link_libraries(parquet_shared PRIVATE ${LIBPARQUET_PRIVATE_LINK_LIBS})
endif()
if (PARQUET_BUILD_STATIC)
@@ -491,7 +494,8 @@ if (PARQUET_BUILD_STATIC)
PROPERTIES
LIBRARY_OUTPUT_DIRECTORY "${BUILD_OUTPUT_ROOT_DIRECTORY}"
OUTPUT_NAME "parquet")
- target_link_libraries(parquet_static ${LIBPARQUET_LINK_LIBS})
+ target_link_libraries(parquet_static PUBLIC ${LIBPARQUET_LINK_LIBS})
+ target_link_libraries(parquet_static PRIVATE ${LIBPARQUET_PRIVATE_LINK_LIBS})
endif()
add_subdirectory(src/parquet)