Repository: parquet-cpp Updated Branches: refs/heads/master a5bcc38a4 -> f8573ebed
PARQUET-945: Thrift static libraries are not used with recent patch Author: Deepak Majeti <[email protected]> Closes #290 from majetideepak/PARQUET-945 and squashes the following commits: 875da78 [Deepak Majeti] remove thrift shared library detection 0ce8623 [Deepak Majeti] Fix static library resolution Project: http://git-wip-us.apache.org/repos/asf/parquet-cpp/repo Commit: http://git-wip-us.apache.org/repos/asf/parquet-cpp/commit/f8573ebe Tree: http://git-wip-us.apache.org/repos/asf/parquet-cpp/tree/f8573ebe Diff: http://git-wip-us.apache.org/repos/asf/parquet-cpp/diff/f8573ebe Branch: refs/heads/master Commit: f8573ebedbeb3498a3cb5b5234131f913713d6ec Parents: a5bcc38 Author: Deepak Majeti <[email protected]> Authored: Tue Apr 4 16:42:34 2017 -0400 Committer: Wes McKinney <[email protected]> Committed: Tue Apr 4 16:42:34 2017 -0400 ---------------------------------------------------------------------- cmake_modules/FindThrift.cmake | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/f8573ebe/cmake_modules/FindThrift.cmake ---------------------------------------------------------------------- diff --git a/cmake_modules/FindThrift.cmake b/cmake_modules/FindThrift.cmake index 57ed932..43766e5 100644 --- a/cmake_modules/FindThrift.cmake +++ b/cmake_modules/FindThrift.cmake @@ -25,7 +25,7 @@ # THRIFT_VERSION, version string of ant if found # THRIFT_INCLUDE_DIR, where to find THRIFT headers # THRIFT_CONTRIB_DIR, where contrib thrift files (e.g. fb303.thrift) are installed -# THRIFT_LIBS, THRIFT libraries +# THRIFT_STATIC_LIB, THRIFT static library # THRIFT_FOUND, If false, do not try to use ant # prefer the thrift version supplied in THRIFT_HOME @@ -48,29 +48,21 @@ find_path(THRIFT_CONTRIB_DIR share/fb303/if/fb303.thrift HINTS NO_DEFAULT_PATH ) -find_library(THRIFT_STATIC_LIB +find_library(THRIFT_STATIC_LIB NAMES ${CMAKE_STATIC_LIBRARY_PREFIX}thrift${CMAKE_STATIC_LIBRARY_SUFFIX} HINTS ${_thrift_roots} NO_DEFAULT_PATH PATH_SUFFIXES "lib/${CMAKE_LIBRARY_ARCHITECTURE}" "lib" ) -find_library(THRIFT_LIB NAMES - ${CMAKE_SHARED_LIBRARY_PREFIX}thrift${CMAKE_SHARED_LIBRARY_SUFFIX} - HINTS ${_thrift_roots} - NO_DEFAULT_PATH - PATH_SUFFIXES "lib/${CMAKE_LIBRARY_ARCHITECTURE}" "lib" -) - find_program(THRIFT_COMPILER thrift HINTS ${_thrift_roots} NO_DEFAULT_PATH PATH_SUFFIXES "bin" ) -if (THRIFT_LIB) +if (THRIFT_STATIC_LIB) set(THRIFT_FOUND TRUE) - set(THRIFT_LIBS ${THRIFT_LIB}) exec_program(${THRIFT_COMPILER} ARGS -version OUTPUT_VARIABLE THRIFT_VERSION RETURN_VALUE THRIFT_RETURN) else () @@ -84,12 +76,12 @@ if (THRIFT_FOUND) else () message(STATUS "Thrift compiler/libraries NOT found. " "Thrift support will be disabled (${THRIFT_RETURN}, " - "${THRIFT_INCLUDE_DIR}, ${THRIFT_LIB})") + "${THRIFT_INCLUDE_DIR}, ${THRIFT_STATIC_LIB})") endif () mark_as_advanced( - THRIFT_LIB + THRIFT_STATIC_LIB THRIFT_COMPILER THRIFT_INCLUDE_DIR )
