Repository: orc Updated Branches: refs/heads/master 342e151f0 -> 61e947c89
ORC-371: [C++] Disable Libhdfspp build when Cyrus SASL is not found Fixes #285 Signed-off-by: Deepak Majeti <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/orc/repo Commit: http://git-wip-us.apache.org/repos/asf/orc/commit/61e947c8 Tree: http://git-wip-us.apache.org/repos/asf/orc/tree/61e947c8 Diff: http://git-wip-us.apache.org/repos/asf/orc/diff/61e947c8 Branch: refs/heads/master Commit: 61e947c89b0064546ad5efc1cfe4b5416c7bbe59 Parents: 342e151 Author: Anatoli Shein <[email protected]> Authored: Tue Jun 19 14:29:44 2018 -0400 Committer: Deepak Majeti <[email protected]> Committed: Wed Jun 27 22:53:43 2018 -0400 ---------------------------------------------------------------------- c++/src/CMakeLists.txt | 11 ++++------- cmake_modules/ThirdpartyToolchain.cmake | 2 ++ 2 files changed, 6 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/orc/blob/61e947c8/c++/src/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/c++/src/CMakeLists.txt b/c++/src/CMakeLists.txt index c3d5993..91c67d5 100644 --- a/c++/src/CMakeLists.txt +++ b/c++/src/CMakeLists.txt @@ -189,9 +189,10 @@ set(SOURCE_FILES Vector.cc Writer.cc) -if(ORC_CXX_HAS_THREAD_LOCAL AND BUILD_LIBHDFSPP) +if(BUILD_LIBHDFSPP) set(SOURCE_FILES ${SOURCE_FILES} OrcHdfsFile.cc) -endif(ORC_CXX_HAS_THREAD_LOCAL AND BUILD_LIBHDFSPP) + add_definitions(-DBUILD_LIBHDFSPP) +endif(BUILD_LIBHDFSPP) add_library (orc STATIC ${SOURCE_FILES}) @@ -203,8 +204,4 @@ target_link_libraries (orc ${LIBHDFSPP_LIBRARIES} ) -install(TARGETS orc DESTINATION lib) - -if(ORC_CXX_HAS_THREAD_LOCAL AND BUILD_LIBHDFSPP) - add_definitions(-DBUILD_LIBHDFSPP) -endif(ORC_CXX_HAS_THREAD_LOCAL AND BUILD_LIBHDFSPP) +install(TARGETS orc DESTINATION lib) \ No newline at end of file http://git-wip-us.apache.org/repos/asf/orc/blob/61e947c8/cmake_modules/ThirdpartyToolchain.cmake ---------------------------------------------------------------------- diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake index 539185c..0272263 100644 --- a/cmake_modules/ThirdpartyToolchain.cmake +++ b/cmake_modules/ThirdpartyToolchain.cmake @@ -287,11 +287,13 @@ endif () # LIBHDFSPP if(BUILD_LIBHDFSPP) + set (BUILD_LIBHDFSPP FALSE) if(ORC_CXX_HAS_THREAD_LOCAL) find_package(CyrusSASL) find_package(OpenSSL) find_package(Threads) if (CYRUS_SASL_SHARED_LIB AND OPENSSL_LIBRARIES) + set (BUILD_LIBHDFSPP TRUE) set (LIBHDFSPP_PREFIX "${THIRDPARTY_DIR}/libhdfspp_ep-install") set (LIBHDFSPP_INCLUDE_DIR "${LIBHDFSPP_PREFIX}/include") set (LIBHDFSPP_STATIC_LIB_NAME hdfspp_static)
