You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by ra...@apache.org on 2019/06/10 10:44:05 UTC
[arrow] branch master updated: ARROW-5485: [C++] Install libraries
from googletest_ep into build output directory on non-Windows platforms.
This is an automated email from the ASF dual-hosted git repository.
ravindra pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/master by this push:
new 37e6183 ARROW-5485: [C++] Install libraries from googletest_ep into build output directory on non-Windows platforms.
37e6183 is described below
commit 37e6183d7e17a68d53b3cf4e6d3e4fa3d3016a6c
Author: Praveen <pr...@dremio.com>
AuthorDate: Mon Jun 10 16:13:38 2019 +0530
ARROW-5485: [C++] Install libraries from googletest_ep into build output directory on non-Windows platforms.
- Copy GTest libraries into the artifact folder
- Use Rpath to install GTest libraries.
- Turn tests back on for Gandiva crossbow.
Author: Praveen <pr...@dremio.com>
Author: Wes McKinney <we...@apache.org>
Closes #4499 from praveenbingo/ARROW-5485-3 and squashes the following commits:
94895657 <Praveen> Fix lint issues.
e4c23303 <Praveen> Turn on MacOS tests.
49fa04b8 <Praveen> Link Gtest with Rpath enabled.
a935109c <Wes McKinney> Set googletest_ep CMAKE_LIBRARY_OUTPUT_DIRECTORY on non-Windows platforms
---
cpp/cmake_modules/ThirdpartyToolchain.cmake | 15 ++++++++++-----
dev/tasks/gandiva-jars/build-cpp-osx.sh | 2 +-
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake
index 258ba01..a936ce2 100644
--- a/cpp/cmake_modules/ThirdpartyToolchain.cmake
+++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake
@@ -1225,22 +1225,27 @@ macro(build_gtest)
${EP_COMMON_TOOLCHAIN}
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
"-DCMAKE_INSTALL_PREFIX=${GTEST_PREFIX}"
- "-DCMAKE_INSTALL_LIBDIR=lib"
-DBUILD_SHARED_LIBS=ON
-DCMAKE_CXX_FLAGS=${GTEST_CMAKE_CXX_FLAGS}
-DCMAKE_CXX_FLAGS_${UPPERCASE_BUILD_TYPE}=${GTEST_CMAKE_CXX_FLAGS})
set(GMOCK_INCLUDE_DIR "${GTEST_PREFIX}/include")
+ if(APPLE)
+ set(GTEST_CMAKE_ARGS ${GTEST_CMAKE_ARGS} "-DCMAKE_MACOSX_RPATH:BOOL=ON")
+ endif()
+
+ set(_GTEST_LIBRARY_DIR ${BUILD_OUTPUT_ROOT_DIRECTORY})
if(MSVC)
- if("${CMAKE_GENERATOR}" STREQUAL "Ninja")
- set(_GTEST_LIBRARY_DIR ${BUILD_OUTPUT_ROOT_DIRECTORY})
- else()
+ if(NOT ("${CMAKE_GENERATOR}" STREQUAL "Ninja"))
set(_GTEST_LIBRARY_DIR ${BUILD_OUTPUT_ROOT_DIRECTORY}/${CMAKE_BUILD_TYPE})
endif()
-
set(GTEST_CMAKE_ARGS
${GTEST_CMAKE_ARGS} "-DCMAKE_RUNTIME_OUTPUT_DIRECTORY=${_GTEST_LIBRARY_DIR}"
"-DCMAKE_RUNTIME_OUTPUT_DIRECTORY_${CMAKE_BUILD_TYPE}=${_GTEST_LIBRARY_DIR}")
+ else()
+ set(GTEST_CMAKE_ARGS
+ ${GTEST_CMAKE_ARGS} "-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=${_GTEST_LIBRARY_DIR}"
+ "-DCMAKE_RUNTIME_OUTPUT_DIRECTORY_${CMAKE_BUILD_TYPE}=${_GTEST_LIBRARY_DIR}")
endif()
add_definitions(-DGTEST_LINKED_AS_SHARED_LIBRARY=1)
diff --git a/dev/tasks/gandiva-jars/build-cpp-osx.sh b/dev/tasks/gandiva-jars/build-cpp-osx.sh
index c5b4f07..14dc5f2 100755
--- a/dev/tasks/gandiva-jars/build-cpp-osx.sh
+++ b/dev/tasks/gandiva-jars/build-cpp-osx.sh
@@ -29,7 +29,7 @@ pushd cpp
-DARROW_GANDIVA=ON \
-DARROW_GANDIVA_JAVA=ON \
-DARROW_GANDIVA_STATIC_LIBSTDCPP=ON \
- -DARROW_BUILD_TESTS=OFF \
+ -DARROW_BUILD_TESTS=ON \
-DARROW_BUILD_UTILITIES=OFF \
-DPARQUET_BUILD_ENCRYPTION=OFF \
-DARROW_PARQUET=OFF \