parquet-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From w...@apache.org
Subject parquet-cpp git commit: PARQUET-885: Do not search for Thrift in default system paths
Date Tue, 21 Feb 2017 14:18:47 GMT
Repository: parquet-cpp
Updated Branches:
  refs/heads/master bdd1fa53d -> 16395d04d


PARQUET-885: Do not search for Thrift in default system paths

This will be a better out-of-the-box experience for users who have Thrift installed through
some other means, possibly without being built with -fPIC for static linking.

Author: Wes McKinney <wes.mckinney@twosigma.com>

Closes #252 from wesm/PARQUET-885 and squashes the following commits:

60694ad [Wes McKinney] Do not search for Thrift in default system paths


Project: http://git-wip-us.apache.org/repos/asf/parquet-cpp/repo
Commit: http://git-wip-us.apache.org/repos/asf/parquet-cpp/commit/16395d04
Tree: http://git-wip-us.apache.org/repos/asf/parquet-cpp/tree/16395d04
Diff: http://git-wip-us.apache.org/repos/asf/parquet-cpp/diff/16395d04

Branch: refs/heads/master
Commit: 16395d04d139e700f8432979dc140889bc8b0a7a
Parents: bdd1fa5
Author: Wes McKinney <wes.mckinney@twosigma.com>
Authored: Tue Feb 21 09:18:40 2017 -0500
Committer: Wes McKinney <wes.mckinney@twosigma.com>
Committed: Tue Feb 21 09:18:40 2017 -0500

----------------------------------------------------------------------
 cmake_modules/FindThrift.cmake | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/16395d04/cmake_modules/FindThrift.cmake
----------------------------------------------------------------------
diff --git a/cmake_modules/FindThrift.cmake b/cmake_modules/FindThrift.cmake
index 26ae7fb..f5e93c2 100644
--- a/cmake_modules/FindThrift.cmake
+++ b/cmake_modules/FindThrift.cmake
@@ -24,19 +24,17 @@
 message(STATUS "THRIFT_HOME: $ENV{THRIFT_HOME}")
 find_path(THRIFT_INCLUDE_DIR thrift/Thrift.h HINTS
   $ENV{THRIFT_HOME}/include/
-  /usr/local/include/
-  /opt/local/include/
+  NO_DEFAULT_PATH
 )
 
 find_path(THRIFT_CONTRIB_DIR share/fb303/if/fb303.thrift HINTS
   $ENV{THRIFT_HOME}
-  /usr/local/
+  NO_DEFAULT_PATH
 )
 
 set(THRIFT_LIB_PATHS
   $ENV{THRIFT_HOME}/lib
-  /usr/local/lib
-  /opt/local/lib)
+  NO_DEFAULT_PATH)
 
 find_path(THRIFT_STATIC_LIB_PATH libthrift.a PATHS ${THRIFT_LIB_PATHS})
 
@@ -45,8 +43,6 @@ find_library(THRIFT_LIB NAMES thrift HINTS ${THRIFT_LIB_PATHS})
 
 find_program(THRIFT_COMPILER thrift
   $ENV{THRIFT_HOME}/bin
-  /usr/local/bin
-  /usr/bin
   NO_DEFAULT_PATH
 )
 


Mime
View raw message