Fix Failures

This commit is contained in:
Deepak Majeti authored and Wes McKinney committed 2019-05-03 18:10:55 -05:00
1 parent 35cb57590b
commit 468b99d896
2 files changed
+12 -4

No files matched your search

+9 -3
View File
@@ -67,12 +67,12 @@ endif()
if(Thrift_ROOT)
find_library(THRIFT_STATIC_LIB thrift${THRIFT_MSVC_STATIC_LIB_SUFFIX}
HINTS ${Thrift_ROOT}
PATHS ${Thrift_ROOT}
PATH_SUFFIXES "lib/${CMAKE_LIBRARY_ARCHITECTURE}" "lib")
find_path(THRIFT_INCLUDE_DIR thrift/Thrift.h
HINTS ${Thrift_ROOT}
PATHS ${Thrift_ROOT}
PATH_SUFFIXES "include")
find_program(THRIFT_COMPILER thrift HINTS ${Thrift_ROOT} PATH_SUFFIXES "bin")
find_program(THRIFT_COMPILER thrift PATHS ${Thrift_ROOT} PATH_SUFFIXES "bin")
else()
# THRIFT-4760: The pkgconfig files are currently only installed when using autotools.
# Starting with 0.13, they are also installed for the CMake-based installations of Thrift.
@@ -89,6 +89,12 @@ else()
HINTS ${THRIFT_PC_PREFIX}
NO_DEFAULT_PATH
PATH_SUFFIXES "bin")
else ()
find_library(THRIFT_STATIC_LIB thrift${THRIFT_MSVC_STATIC_LIB_SUFFIX}
PATH_SUFFIXES "lib/${CMAKE_LIBRARY_ARCHITECTURE}" "lib")
find_path(THRIFT_INCLUDE_DIR thrift/Thrift.h
PATH_SUFFIXES "include")
find_program(THRIFT_COMPILER thrift PATH_SUFFIXES "bin")
endif()
endif()
+3 -1
View File
@@ -42,7 +42,9 @@ add_arrow_test(stl-util-test)
add_arrow_test(task-group-test)
add_arrow_test(thread-pool-test)
add_arrow_test(trie-test)
add_arrow_test(uri-test)
if(ARROW_WITH_URIPARSER)
add_arrow_test(uri-test)
endif()
add_arrow_test(utf8-util-test)
add_arrow_benchmark(bit-util-benchmark)