You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@parquet.apache.org by uw...@apache.org on 2016/09/27 07:05:55 UTC
parquet-cpp git commit: PARQUET-732: Fix building a subset of
thirdparty dependencies
Repository: parquet-cpp
Updated Branches:
refs/heads/master 549a58b01 -> 43d949137
PARQUET-732: Fix building a subset of thirdparty dependencies
Author: fscheibner <fl...@snowflake.net>
Closes #168 from flode/fixthirdparty and squashes the following commits:
25808e9 [fscheibner] Fix typo
80d1744 [fscheibner] Fix building a set of thirdparty dependencies
Project: http://git-wip-us.apache.org/repos/asf/parquet-cpp/repo
Commit: http://git-wip-us.apache.org/repos/asf/parquet-cpp/commit/43d94913
Tree: http://git-wip-us.apache.org/repos/asf/parquet-cpp/tree/43d94913
Diff: http://git-wip-us.apache.org/repos/asf/parquet-cpp/diff/43d94913
Branch: refs/heads/master
Commit: 43d9491374359d29c9d0ebf0a566d1a52ae37d48
Parents: 549a58b
Author: fscheibner <fl...@snowflake.net>
Authored: Tue Sep 27 09:05:34 2016 +0200
Committer: Uwe L. Korn <uw...@xhochy.com>
Committed: Tue Sep 27 09:05:34 2016 +0200
----------------------------------------------------------------------
CMakeLists.txt | 14 ++++++++------
thirdparty/build_thirdparty.sh | 2 +-
2 files changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/43d94913/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3cac3e8..b43e823 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -122,7 +122,7 @@ endif()
#
# Arguments after the test name will be passed to set_tests_properties().
function(ADD_PARQUET_BENCHMARK REL_BENCHMARK_NAME)
- if(NOT PARQUET_BUILD_BENCHMARKS)
+ if(NOT PARQUET_BUILD_BENCHMARKS)
return()
endif()
get_filename_component(BENCHMARK_NAME ${REL_BENCHMARK_NAME} NAME_WE)
@@ -301,11 +301,13 @@ add_library(zlibstatic STATIC IMPORTED)
set_target_properties(zlibstatic PROPERTIES IMPORTED_LOCATION ${ZLIB_STATIC_LIB})
## GTest
-add_custom_target(unittest ctest -L unittest)
-find_package(GTest REQUIRED)
-include_directories(SYSTEM ${GTEST_INCLUDE_DIR})
-add_library(gtest STATIC IMPORTED)
-set_target_properties(gtest PROPERTIES IMPORTED_LOCATION ${GTEST_STATIC_LIB})
+if(PARQUET_BUILD_TESTS)
+ add_custom_target(unittest ctest -L unittest)
+ find_package(GTest REQUIRED)
+ include_directories(SYSTEM ${GTEST_INCLUDE_DIR})
+ add_library(gtest STATIC IMPORTED)
+ set_target_properties(gtest PROPERTIES IMPORTED_LOCATION ${GTEST_STATIC_LIB})
+endif()
## Google Benchmark
if ("$ENV{GBENCHMARK_HOME}" STREQUAL "")
http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/43d94913/thirdparty/build_thirdparty.sh
----------------------------------------------------------------------
diff --git a/thirdparty/build_thirdparty.sh b/thirdparty/build_thirdparty.sh
index 8229484..9ae4169 100755
--- a/thirdparty/build_thirdparty.sh
+++ b/thirdparty/build_thirdparty.sh
@@ -13,7 +13,7 @@ if [ "$#" = "0" ]; then
F_ALL=1
else
# Allow passing specific libs to build on the command line
- for arg in "$*"; do
+ for arg in "$@"; do
case $arg in
"arrow") F_ARROW=1 ;;
"zlib") F_ZLIB=1 ;;