Roll back boost contrib.

This commit is contained in:
Nikolai Kochetov 2021-11-10 18:01:26 +03:00
parent 650fe5a834
commit c11243619c
3 changed files with 2 additions and 20 deletions

2
contrib/boost vendored

@ -1 +1 @@
Subproject commit 5bdeca2fd6277dc9801870e7302f67e75e80586f
Subproject commit fcb058e1459ac273ecfe7cdf72791cb1479115af

View File

@ -14,12 +14,11 @@ if (NOT USE_INTERNAL_BOOST_LIBRARY)
context
coroutine
graph
thread
)
if(Boost_INCLUDE_DIR AND Boost_FILESYSTEM_LIBRARY AND
Boost_PROGRAM_OPTIONS_LIBRARY AND Boost_REGEX_LIBRARY AND Boost_SYSTEM_LIBRARY AND Boost_CONTEXT_LIBRARY AND
Boost_COROUTINE_LIBRARY AND Boost_GRAPH_LIBRARY AND Boost_THREAD_LIBRARY)
Boost_COROUTINE_LIBRARY AND Boost_GRAPH_LIBRARY)
set(EXTERNAL_BOOST_FOUND 1)
@ -35,7 +34,6 @@ if (NOT USE_INTERNAL_BOOST_LIBRARY)
add_library (_boost_context INTERFACE)
add_library (_boost_coroutine INTERFACE)
add_library (_boost_graph INTERFACE)
add_library (_boost_thread INTERFACE)
target_link_libraries (_boost_filesystem INTERFACE ${Boost_FILESYSTEM_LIBRARY})
target_link_libraries (_boost_iostreams INTERFACE ${Boost_IOSTREAMS_LIBRARY})
@ -45,7 +43,6 @@ if (NOT USE_INTERNAL_BOOST_LIBRARY)
target_link_libraries (_boost_context INTERFACE ${Boost_CONTEXT_LIBRARY})
target_link_libraries (_boost_coroutine INTERFACE ${Boost_COROUTINE_LIBRARY})
target_link_libraries (_boost_graph INTERFACE ${Boost_GRAPH_LIBRARY})
target_link_libraries (_boost_thread INTERFACE ${Boost_THREAD_LIBRARY})
add_library (boost::filesystem ALIAS _boost_filesystem)
add_library (boost::iostreams ALIAS _boost_iostreams)
@ -55,7 +52,6 @@ if (NOT USE_INTERNAL_BOOST_LIBRARY)
add_library (boost::context ALIAS _boost_context)
add_library (boost::coroutine ALIAS _boost_coroutine)
add_library (boost::graph ALIAS _boost_graph)
add_library (boost::thread ALIAS _boost_thread)
else()
set(EXTERNAL_BOOST_FOUND 0)
message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find system boost")
@ -252,17 +248,4 @@ if (NOT EXTERNAL_BOOST_FOUND)
add_library(boost::heap ALIAS _boost_heap)
target_include_directories(_boost_heap SYSTEM BEFORE INTERFACE ${LIBRARY_DIR})
# thread
set (SRCS_THREAD
"${LIBRARY_DIR}/libs/thread/src/future.cpp"
"${LIBRARY_DIR}/libs/thread/src/tss_null.cpp"
"${LIBRARY_DIR}/libs/thread/src/pthread/once.cpp"
"${LIBRARY_DIR}/libs/thread/src/pthread/thread.cpp"
)
add_library (_boost_thread ${SRCS_THREAD})
add_library (boost::thread ALIAS _boost_thread)
target_include_directories (_boost_thread PRIVATE ${LIBRARY_DIR})
endif ()

View File

@ -348,7 +348,6 @@ dbms_target_link_libraries (
PRIVATE
boost::filesystem
boost::program_options
boost::thread
clickhouse_common_config
clickhouse_common_zookeeper
clickhouse_dictionaries_embedded