You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@parquet.apache.org by md...@apache.org on 2018/04/23 14:45:33 UTC
[parquet-cpp] branch master updated: PARQUET-1262: Use the same
BOOST_ROOT and Boost_NAMESPACE for Thrift
This is an automated email from the ASF dual-hosted git repository.
mdeepak pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/parquet-cpp.git
The following commit(s) were added to refs/heads/master by this push:
new 26422f5 PARQUET-1262: Use the same BOOST_ROOT and Boost_NAMESPACE for Thrift
26422f5 is described below
commit 26422f58c47cfd44b003248fe8bac05f1a65bb4d
Author: Korn, Uwe <Uw...@blue-yonder.com>
AuthorDate: Mon Apr 23 10:45:22 2018 -0400
PARQUET-1262: Use the same BOOST_ROOT and Boost_NAMESPACE for Thrift
Author: Korn, Uwe <Uw...@blue-yonder.com>
Closes #460 from xhochy/PARQUET-1262 and squashes the following commits:
2a886ce [Korn, Uwe] PARQUET-1262: Use the same BOOST_ROOT and Boost_NAMESPACE for Thrift
---
cmake_modules/ThirdpartyToolchain.cmake | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake
index 690fd0b..c23fea9 100644
--- a/cmake_modules/ThirdpartyToolchain.cmake
+++ b/cmake_modules/ThirdpartyToolchain.cmake
@@ -205,6 +205,14 @@ if (NOT THRIFT_FOUND)
"-DWITH_LIBEVENT=OFF"
)
+ # Thrift also uses boost. Forward important boost settings if there were ones passed.
+ if (DEFINED BOOST_ROOT)
+ set(THRIFT_CMAKE_ARGS ${THRIFT_CMAKE_ARGS} "-DBOOST_ROOT=${BOOST_ROOT}")
+ endif()
+ if (DEFINED Boost_NAMESPACE)
+ set(THRIFT_CMAKE_ARGS ${THRIFT_CMAKE_ARGS} "-DBoost_NAMESPACE=${Boost_NAMESPACE}")
+ endif()
+
set(THRIFT_STATIC_LIB_NAME "${CMAKE_STATIC_LIBRARY_PREFIX}thrift")
if (MSVC)
if (PARQUET_USE_STATIC_CRT)
--
To stop receiving notification emails like this one, please contact
mdeepak@apache.org.