HDFS-16736. Link to Boost library in libhdfspp (#4782)
This commit is contained in:
parent
231a4468cd
commit
5736b34b2a
|
@ -28,7 +28,7 @@ project (libhdfspp)
|
||||||
|
|
||||||
cmake_minimum_required(VERSION 2.8)
|
cmake_minimum_required(VERSION 2.8)
|
||||||
|
|
||||||
find_package (Boost 1.72.0 REQUIRED)
|
find_package (Boost 1.72.0 REQUIRED COMPONENTS date_time)
|
||||||
|
|
||||||
enable_testing()
|
enable_testing()
|
||||||
set(CMAKE_CXX_STANDARD 17)
|
set(CMAKE_CXX_STANDARD 17)
|
||||||
|
@ -283,7 +283,7 @@ if (HADOOP_BUILD AND NOT MSVC)
|
||||||
${OPENSSL_LIBRARIES}
|
${OPENSSL_LIBRARIES}
|
||||||
${SASL_LIBRARIES}
|
${SASL_LIBRARIES}
|
||||||
${CMAKE_THREAD_LIBS_INIT}
|
${CMAKE_THREAD_LIBS_INIT}
|
||||||
)
|
${Boost_LIBRARIES})
|
||||||
set_target_properties(hdfspp PROPERTIES SOVERSION ${LIBHDFSPP_VERSION})
|
set_target_properties(hdfspp PROPERTIES SOVERSION ${LIBHDFSPP_VERSION})
|
||||||
hadoop_dual_output_directory(hdfspp ${OUT_DIR})
|
hadoop_dual_output_directory(hdfspp ${OUT_DIR})
|
||||||
else (HADOOP_BUILD AND NOT MSVC)
|
else (HADOOP_BUILD AND NOT MSVC)
|
||||||
|
@ -293,7 +293,8 @@ else (HADOOP_BUILD AND NOT MSVC)
|
||||||
${PROTOBUF_LIBRARY}
|
${PROTOBUF_LIBRARY}
|
||||||
${OPENSSL_LIBRARIES}
|
${OPENSSL_LIBRARIES}
|
||||||
${SASL_LIBRARIES}
|
${SASL_LIBRARIES}
|
||||||
${CMAKE_THREAD_LIBS_INIT})
|
${CMAKE_THREAD_LIBS_INIT}
|
||||||
|
${Boost_LIBRARIES})
|
||||||
if(BUILD_SHARED_HDFSPP)
|
if(BUILD_SHARED_HDFSPP)
|
||||||
add_library(hdfspp SHARED ${EMPTY_FILE_CC} ${LIBHDFSPP_ALL_OBJECTS})
|
add_library(hdfspp SHARED ${EMPTY_FILE_CC} ${LIBHDFSPP_ALL_OBJECTS})
|
||||||
set_target_properties(hdfspp PROPERTIES SOVERSION ${LIBHDFSPP_VERSION})
|
set_target_properties(hdfspp PROPERTIES SOVERSION ${LIBHDFSPP_VERSION})
|
||||||
|
|
|
@ -30,3 +30,4 @@ target_include_directories(rpc_obj PRIVATE ../../lib)
|
||||||
add_dependencies(rpc_obj proto)
|
add_dependencies(rpc_obj proto)
|
||||||
add_library(rpc $<TARGET_OBJECTS:rpc_obj>)
|
add_library(rpc $<TARGET_OBJECTS:rpc_obj>)
|
||||||
target_include_directories(rpc PRIVATE ../../lib)
|
target_include_directories(rpc PRIVATE ../../lib)
|
||||||
|
target_link_libraries(rpc PRIVATE ${Boost_LIBRARIES})
|
||||||
|
|
|
@ -16,8 +16,6 @@
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
#
|
#
|
||||||
|
|
||||||
find_package(Boost REQUIRED COMPONENTS date_time)
|
|
||||||
|
|
||||||
# Delegate some functionality to libhdfs, until libhdfspp is complete.
|
# Delegate some functionality to libhdfs, until libhdfspp is complete.
|
||||||
set (LIBHDFS_SRC_DIR ../../libhdfs)
|
set (LIBHDFS_SRC_DIR ../../libhdfs)
|
||||||
set (LIBHDFS_TESTS_DIR ../../libhdfs-tests)
|
set (LIBHDFS_TESTS_DIR ../../libhdfs-tests)
|
||||||
|
|
Loading…
Reference in New Issue