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/12/20 21:16:59 UTC
parquet-cpp git commit: PARQUET-811: Use Brotli static libraries if
they are available
Repository: parquet-cpp
Updated Branches:
refs/heads/master 0e195730d -> a74c3016a
PARQUET-811: Use Brotli static libraries if they are available
If a user has both shared and static libraries in their `$BROTLI_HOME`, the shared libraries were being chosen.
Author: Wes McKinney <we...@twosigma.com>
Closes #205 from wesm/PARQUET-811 and squashes the following commits:
f36ec2c [Wes McKinney] Use Brotli static libraries if they are available
Project: http://git-wip-us.apache.org/repos/asf/parquet-cpp/repo
Commit: http://git-wip-us.apache.org/repos/asf/parquet-cpp/commit/a74c3016
Tree: http://git-wip-us.apache.org/repos/asf/parquet-cpp/tree/a74c3016
Diff: http://git-wip-us.apache.org/repos/asf/parquet-cpp/diff/a74c3016
Branch: refs/heads/master
Commit: a74c3016aea999e740212fe62d6eeef05404d52b
Parents: 0e19573
Author: Wes McKinney <we...@twosigma.com>
Authored: Tue Dec 20 16:16:52 2016 -0500
Committer: Wes McKinney <we...@twosigma.com>
Committed: Tue Dec 20 16:16:52 2016 -0500
----------------------------------------------------------------------
cmake_modules/FindBrotli.cmake | 6 +++---
thirdparty/build_thirdparty.sh | 8 +++++++-
2 files changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/a74c3016/cmake_modules/FindBrotli.cmake
----------------------------------------------------------------------
diff --git a/cmake_modules/FindBrotli.cmake b/cmake_modules/FindBrotli.cmake
index 9df15ee..c6524de 100644
--- a/cmake_modules/FindBrotli.cmake
+++ b/cmake_modules/FindBrotli.cmake
@@ -43,13 +43,13 @@ if ( _brotli_roots )
find_path( BROTLI_INCLUDE_DIR NAMES brotli/decode.h
PATHS ${_brotli_roots} NO_DEFAULT_PATH
PATH_SUFFIXES "include" )
- find_library( BROTLI_LIBRARY_ENC NAMES brotlienc
+ find_library( BROTLI_LIBRARY_ENC NAMES libbrotlienc.a brotlienc
PATHS ${_brotli_roots} NO_DEFAULT_PATH
PATH_SUFFIXES "lib/${CMAKE_LIBRARY_ARCHITECTURE}" "lib" )
- find_library( BROTLI_LIBRARY_DEC NAMES brotlidec
+ find_library( BROTLI_LIBRARY_DEC NAMES libbrotlidec.a brotlidec
PATHS ${_brotli_roots} NO_DEFAULT_PATH
PATH_SUFFIXES "lib/${CMAKE_LIBRARY_ARCHITECTURE}" "lib" )
- find_library( BROTLI_LIBRARY_COMMON NAMES brotlicommon
+ find_library( BROTLI_LIBRARY_COMMON NAMES libbrotlicommon.a brotlicommon
PATHS ${_brotli_roots} NO_DEFAULT_PATH
PATH_SUFFIXES "lib/${CMAKE_LIBRARY_ARCHITECTURE}" "lib" )
else ()
http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/a74c3016/thirdparty/build_thirdparty.sh
----------------------------------------------------------------------
diff --git a/thirdparty/build_thirdparty.sh b/thirdparty/build_thirdparty.sh
index 727e722..6eb838b 100755
--- a/thirdparty/build_thirdparty.sh
+++ b/thirdparty/build_thirdparty.sh
@@ -148,7 +148,13 @@ fi
# build brotli
if [ -n "$F_ALL" -o -n "$F_BROTLI" ]; then
cd $TP_DIR/$BROTLI_BASEDIR
- cmake -DCMAKE_INSTALL_PREFIX=$PREFIX -DBUILD_SHARED_LIBS=OFF .
+ cmake -DCMAKE_INSTALL_PREFIX=$PREFIX \
+ -DCMAKE_INSTALL_LIBDIR="lib" \
+ -DBUILD_SHARED_LIBS=OFF .
+ make -j$PARALLEL install
+ cmake -DCMAKE_INSTALL_PREFIX=$PREFIX \
+ -DCMAKE_INSTALL_LIBDIR="lib" \
+ -DBUILD_SHARED_LIBS=on .
make -j$PARALLEL install
# :
fi