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 2019/02/18 18:28:18 UTC
[arrow] branch master updated: ARROW-4613: [C++] Set
CMAKE_INSTALL_LIBDIR in gtest thirdparty build
This is an automated email from the ASF dual-hosted git repository.
wesm 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 43f253d ARROW-4613: [C++] Set CMAKE_INSTALL_LIBDIR in gtest thirdparty build
43f253d is described below
commit 43f253d39e45ebe9cd0a2e9b253bff5e0204f2fd
Author: Uwe L. Korn <uw...@xhochy.com>
AuthorDate: Mon Feb 18 12:28:00 2019 -0600
ARROW-4613: [C++] Set CMAKE_INSTALL_LIBDIR in gtest thirdparty build
Author: Uwe L. Korn <uw...@xhochy.com>
Closes #3686 from xhochy/ARROW-4613 and squashes the following commits:
9237844de <Uwe L. Korn> ARROW-4613: Hardcode libdir in gtest thirdparty build
---
cpp/Dockerfile.alpine | 1 +
cpp/cmake_modules/ThirdpartyToolchain.cmake | 1 +
2 files changed, 2 insertions(+)
diff --git a/cpp/Dockerfile.alpine b/cpp/Dockerfile.alpine
index 3c412e6..28a815f 100644
--- a/cpp/Dockerfile.alpine
+++ b/cpp/Dockerfile.alpine
@@ -32,6 +32,7 @@ RUN apk add --no-cache -q \
make \
musl-dev \
ninja \
+ openssl-dev \
wget \
zlib-dev
diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake
index 94ce527..61266cd 100644
--- a/cpp/cmake_modules/ThirdpartyToolchain.cmake
+++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake
@@ -685,6 +685,7 @@ if(ARROW_BUILD_TESTS OR ARROW_BUILD_BENCHMARKS)
set(GTEST_VENDORED 1)
set(GTEST_CMAKE_ARGS ${EP_COMMON_CMAKE_ARGS}
"-DCMAKE_INSTALL_PREFIX=${GTEST_PREFIX}"
+ "-DCMAKE_INSTALL_LIBDIR=lib"
-DCMAKE_CXX_FLAGS=${GTEST_CMAKE_CXX_FLAGS})
set(GMOCK_INCLUDE_DIR "${GTEST_PREFIX}/include")
set(GMOCK_STATIC_LIB