parquet-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From u..@apache.org
Subject [parquet-cpp] branch master updated: PARQUET-1319: Pass BISON_EXECUTABLE to Thrift EP for MacOS
Date Thu, 14 Jun 2018 13:38:53 GMT
This is an automated email from the ASF dual-hosted git repository.

uwe 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 d15d268  PARQUET-1319: Pass BISON_EXECUTABLE to Thrift EP for MacOS
d15d268 is described below

commit d15d2687e9f154e69e956e2a56c8d1fd6c3b7ac8
Author: thamht4190 <thamht01188@gmail.com>
AuthorDate: Thu Jun 14 15:38:39 2018 +0200

    PARQUET-1319: Pass BISON_EXECUTABLE to Thrift EP for MacOS
    
    Author: thamht4190 <thamht01188@gmail.com>
    Author: gubee <thamht01188@gmail.com>
    
    Closes #470 from thamht4190/PARQUET-1319 and squashes the following commits:
    
    d8ced13 [thamht4190] PARQUET-1319: Pass BISON_EXECUTABLE to Thrift EP for MacOS
    da9c86b [gubee] Merge pull request #1 from apache/master
---
 cmake_modules/ThirdpartyToolchain.cmake | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake
index b2de4d2..1934742 100644
--- a/cmake_modules/ThirdpartyToolchain.cmake
+++ b/cmake_modules/ThirdpartyToolchain.cmake
@@ -249,6 +249,11 @@ if (NOT THRIFT_FOUND)
                           "-DWITH_PLUGIN=OFF"
                           ${THRIFT_CMAKE_ARGS})
     set(THRIFT_DEPENDENCIES ${THRIFT_DEPENDENCIES} zlib_ep)
+  elseif (APPLE)
+    if (DEFINED BISON_EXECUTABLE)
+      set(THRIFT_CMAKE_ARGS "-DBISON_EXECUTABLE=${BISON_EXECUTABLE}"
+                            ${THRIFT_CMAKE_ARGS})
+    endif()
   endif()
 
   ExternalProject_Add(thrift_ep

-- 
To stop receiving notification emails like this one, please contact
uwe@apache.org.

Mime
View raw message