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/04 19:20:48 UTC
[arrow] branch master updated: ARROW-4471: [C++] Pass AR and RANLIB
to all external projects
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 170a7ff ARROW-4471: [C++] Pass AR and RANLIB to all external projects
170a7ff is described below
commit 170a7ff9dff8909311eb7849db1cf6a64ac8c4e3
Author: Korn, Uwe <Uw...@blue-yonder.com>
AuthorDate: Mon Feb 4 13:20:34 2019 -0600
ARROW-4471: [C++] Pass AR and RANLIB to all external projects
With the latest updates I have problems linking to gbenchmark on OSX, this fixes it.
Author: Korn, Uwe <Uw...@blue-yonder.com>
Closes #3550 from xhochy/ARROW-4471 and squashes the following commits:
b0608b0a7 <Korn, Uwe> Use linebreaks to separate arguments
9c2071446 <Korn, Uwe> ARROW-4471: Pass AR and RANLIB to all external projects
---
cpp/CMakeLists.txt | 2 ++
cpp/cmake_modules/ThirdpartyToolchain.cmake | 10 ++++++++++
2 files changed, 12 insertions(+)
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
index e0dbcd3..707514a 100644
--- a/cpp/CMakeLists.txt
+++ b/cpp/CMakeLists.txt
@@ -58,6 +58,8 @@ include(FindPkgConfig)
include(GNUInstallDirs)
+cmake_policy(SET CMP0025 NEW)
+
# Compatibility with CMake 3.1
if(POLICY CMP0054)
# http://www.cmake.org/cmake/help/v3.1/policy/CMP0054.html
diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake
index ff22525..5f3b54c 100644
--- a/cpp/cmake_modules/ThirdpartyToolchain.cmake
+++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake
@@ -355,6 +355,16 @@ set(EP_COMMON_CMAKE_ARGS ${EP_COMMON_CMAKE_ARGS}
-DCMAKE_CXX_FLAGS=${EP_CXX_FLAGS}
-DCMAKE_CXX_FLAGS_${UPPERCASE_BUILD_TYPE}=${EP_CXX_FLAGS})
+if (CMAKE_AR)
+ set(EP_COMMON_CMAKE_ARGS ${EP_COMMON_CMAKE_ARGS}
+ -DCMAKE_AR=${CMAKE_AR})
+endif()
+
+if (CMAKE_RANLIB)
+ set(EP_COMMON_CMAKE_ARGS ${EP_COMMON_CMAKE_ARGS}
+ -DCMAKE_RANLIB=${CMAKE_RANLIB})
+endif()
+
if (NOT ARROW_VERBOSE_THIRDPARTY_BUILD)
set(EP_LOG_OPTIONS
LOG_CONFIGURE 1