From be5c099e02dd3ec7b87744f5a029aa12ad074ab2 Mon Sep 17 00:00:00 2001 From: proller Date: Thu, 5 Sep 2019 19:13:25 +0300 Subject: [PATCH] wip --- cmake/find_orc.cmake | 9 ++++++++- contrib/CMakeLists.txt | 12 ++++-------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/cmake/find_orc.cmake b/cmake/find_orc.cmake index 3676bec1b6b..b9f758c8090 100644 --- a/cmake/find_orc.cmake +++ b/cmake/find_orc.cmake @@ -5,4 +5,11 @@ set(USE_INTERNAL_ORC_LIBRARY ON) if (ARROW_LIBRARY) set(USE_ORC 1) -endif() \ No newline at end of file +endif() + + +find_path(CYRUS_SASL_INCLUDE_DIR sasl/sasl.h) +find_library(CYRUS_SASL_SHARED_LIB sasl2) +if (NOT CYRUS_SASL_INCLUDE_DIR OR NOT CYRUS_SASL_SHARED_LIB) + set(USE_ORC 0) +endif() diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt index 96462de0190..ed537f755a1 100644 --- a/contrib/CMakeLists.txt +++ b/contrib/CMakeLists.txt @@ -11,14 +11,10 @@ endif () set_property(DIRECTORY PROPERTY EXCLUDE_FROM_ALL 1) if (USE_INTERNAL_ORC_LIBRARY) - set(BUILD_JAVA OFF) - set (ANALYZE_JAVA OFF) - set (BUILD_CPP_TESTS OFF) - set (BUILD_TOOLS OFF) - option(BUILD_JAVA OFF) - option (ANALYZE_JAVA OFF) - option (BUILD_CPP_TESTS OFF) - option (BUILD_TOOLS OFF) + set(BUILD_JAVA OFF CACHE INTERNAL "") + set(ANALYZE_JAVA OFF CACHE INTERNAL "") + set(BUILD_CPP_TESTS OFF CACHE INTERNAL "") + set(BUILD_TOOLS OFF CACHE INTERNAL "") set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/contrib/orc/cmake_modules") add_subdirectory(orc) endif()