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 2016/11/26 19:14:47 UTC
arrow git commit: ARROW-390: Only specify dependencies for
json-integration-test on ARROW_BUILD_TESTS=ON
Repository: arrow
Updated Branches:
refs/heads/master f082b1732 -> 197120cbc
ARROW-390: Only specify dependencies for json-integration-test on ARROW_BUILD_TESTS=ON
Author: Uwe L. Korn <uw...@xhochy.com>
Closes #215 from xhochy/ARROW-390 and squashes the following commits:
36d34c7 [Uwe L. Korn] ARROW-390: Only specify dependencies for json-integration-test on ARROW_BUILD_TESTS=ON
Project: http://git-wip-us.apache.org/repos/asf/arrow/repo
Commit: http://git-wip-us.apache.org/repos/asf/arrow/commit/197120cb
Tree: http://git-wip-us.apache.org/repos/asf/arrow/tree/197120cb
Diff: http://git-wip-us.apache.org/repos/asf/arrow/diff/197120cb
Branch: refs/heads/master
Commit: 197120cbc7ae419657bb3d22d1c343b49ec3e984
Parents: f082b17
Author: Uwe L. Korn <uw...@xhochy.com>
Authored: Sat Nov 26 14:14:40 2016 -0500
Committer: Wes McKinney <we...@twosigma.com>
Committed: Sat Nov 26 14:14:40 2016 -0500
----------------------------------------------------------------------
cpp/src/arrow/ipc/CMakeLists.txt | 48 ++++++++++++++++++-----------------
1 file changed, 25 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/arrow/blob/197120cb/cpp/src/arrow/ipc/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/cpp/src/arrow/ipc/CMakeLists.txt b/cpp/src/arrow/ipc/CMakeLists.txt
index f9e7cf7..6f401db 100644
--- a/cpp/src/arrow/ipc/CMakeLists.txt
+++ b/cpp/src/arrow/ipc/CMakeLists.txt
@@ -87,29 +87,31 @@ ARROW_TEST_LINK_LIBRARIES(ipc-json-test
ADD_ARROW_TEST(json-integration-test)
-if (APPLE)
- target_link_libraries(json-integration-test
- arrow_static
- arrow_io
- arrow_ipc
- gflags
- gtest
- boost_filesystem_static
- boost_system_static
- dl)
- set_target_properties(json-integration-test
- PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
-else()
- target_link_libraries(json-integration-test
- arrow_static
- arrow_io
- arrow_ipc
- gflags
- gtest
- pthread
- boost_filesystem_static
- boost_system_static
- dl)
+if (ARROW_BUILD_TESTS)
+ if (APPLE)
+ target_link_libraries(json-integration-test
+ arrow_static
+ arrow_io
+ arrow_ipc
+ gflags
+ gtest
+ boost_filesystem_static
+ boost_system_static
+ dl)
+ set_target_properties(json-integration-test
+ PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
+ else()
+ target_link_libraries(json-integration-test
+ arrow_static
+ arrow_io
+ arrow_ipc
+ gflags
+ gtest
+ pthread
+ boost_filesystem_static
+ boost_system_static
+ dl)
+ endif()
endif()
# make clean will delete the generated file