mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-11-10 01:25:21 +00:00
fc2925b567
commit 2722e540abfee4a527d716474c4ca582eceeee08 Merge: b4f3af824aebddd550
Author: proller <proller@github.com> Date: Tue Aug 21 18:34:18 2018 +0300 Merge remote-tracking branch 'upstream/master' into fix3 commit b4f3af824b88a8b6826583bb483730827574e8ad Author: proller <proller@github.com> Date: Tue Aug 21 17:00:20 2018 +0300 fix commit 3a18fa7ded2a7d6b7a0883a1b9c2d6b99360837d Author: proller <proller@github.com> Date: Tue Aug 21 16:57:17 2018 +0300 fix commit 5d42220c2cf47e1a86bdc73dbfc24b68f8626891 Author: proller <proller@github.com> Date: Tue Aug 21 16:50:21 2018 +0300 freebsd fixes commit 7baf4fb5ba4575f79b0d12a9ffaaabd34e1006da Author: proller <proller@github.com> Date: Tue Aug 21 16:17:19 2018 +0300 fix commit e1fe707fd765b841a8d0952d91a980128cbf91d0 Author: proller <proller@github.com> Date: Tue Aug 21 15:35:21 2018 +0300 fix commit 027887c71b3ffa98d9473d50d8c3b79cbf3304ac Author: proller <proller@github.com> Date: Tue Aug 21 15:25:57 2018 +0300 fix commit 81af41bfcfff7c02fe4060196cf03c2d2aab416e Author: proller <proller@github.com> Date: Tue Aug 21 15:20:41 2018 +0300 fix commit 93d572c85d9c7e331254999a614c3b22b5573b02 Author: proller <proller@github.com> Date: Tue Aug 21 14:58:07 2018 +0300 SPLIT_SHARED commit dd5b8990d8527d59b1e890943d80c2bf27c613ce Author: proller <proller@github.com> Date: Tue Aug 21 14:52:39 2018 +0300 fix commit 4840ca12ab752a38c1ef482e8ec59c5859bb48d7 Author: proller <proller@github.com> Date: Tue Aug 21 14:46:31 2018 +0300 fix commit abde633beb86f2a0d025d6fcf079965dbd827b92 Author: proller <proller@github.com> Date: Tue Aug 21 14:25:32 2018 +0300 fix commit 0d94a5476a5ba8ba5e88638d58f2cfbf2b4b662d Author: proller <proller@github.com> Date: Tue Aug 21 14:45:18 2018 +0300 Travis: try fail on ninja fail commit c2686f90b68255c2beb0a708804aef404e80a6d2 Merge: 2c3427bbd2aa7eb463
Author: proller <proller@github.com> Date: Tue Aug 21 14:25:15 2018 +0300 Merge remote-tracking branch 'upstream/master' into fix3 commit 2c3427bbdb861edbb188ed4621e8a05cafaedafb Author: proller <proller@github.com> Date: Mon Aug 20 23:57:24 2018 +0300 fix commit 530170c6a81d31dcfa81230e48520383234df4bc Merge: 9abec162cf6e4ec970
Author: proller <proller@github.com> Date: Mon Aug 20 23:57:03 2018 +0300 Merge remote-tracking branch 'upstream/master' into fix3 commit 9abec162cb2e09bbc2f33cbe80fe76791f6e5a77 Author: proller <proller@github.com> Date: Mon Aug 20 23:49:58 2018 +0300 Apple fixes commit 36d05e8217440fbc8ae21571b06d4eb6d679d538 Author: proller <proller@github.com> Date: Mon Aug 20 23:25:05 2018 +0300 apple fix commit aeec3e845e4456e89fbb1b1af6f9f36820a46e33 Author: proller <proller@github.com> Date: Mon Aug 20 23:20:06 2018 +0300 fixes commit 427961d916a5954981e47d94733996deb2a616ce Author: proller <proller@github.com> Date: Mon Aug 20 23:11:11 2018 +0300 fix commit a7dd55ff8f653624c0f3dbcbc54defd3b3ae97af Author: proller <proller@github.com> Date: Mon Aug 20 22:41:53 2018 +0300 fix commit 6200e0d315c7a62bae63a8de0fc32f7937770ad2 Merge: 8a541d7e621cedbe46
Author: proller <proller@github.com> Date: Mon Aug 20 22:35:49 2018 +0300 Merge remote-tracking branch 'upstream/master' into fix3 commit 8a541d7e64c89e2c16af6c909e0353361153aaa3 Author: proller <proller@github.com> Date: Mon Aug 20 22:34:32 2018 +0300 Do not use poco types commit fd560f43d048b7e3307c6c6b9c9d9918230014d8 Author: proller <proller@github.com> Date: Mon Aug 20 22:20:42 2018 +0300 Try fix apple build commit cfb2eba07ac06f19e822d3474341d800b1f98cf1 Merge: 8d2e31c905b81fdfc0
Author: proller <proller@github.com> Date: Mon Aug 20 22:03:24 2018 +0300 Merge remote-tracking branch 'upstream/master' into fix3 commit 8d2e31c908be2e99d09e2a9dde2414ab82a5e93c Author: proller <proller@github.com> Date: Mon Aug 20 21:56:06 2018 +0300 travis: TEST_SERVER_STARTUP_WAIT=10
54 lines
2.4 KiB
CMake
54 lines
2.4 KiB
CMake
# Supported contrib/boost source variants:
|
|
# 1. Default - Minimized vrsion from release archive : https://github.com/ClickHouse-Extras/boost
|
|
# 2. Release archive unpacked to contrib/boost
|
|
# 3. Full boost https://github.com/boostorg/boost
|
|
|
|
# if boostorg/boost connected as submodule: Update all boost internal submodules to tag:
|
|
# git submodule foreach "git fetch --all && git checkout boost-1.66.0 || true"
|
|
|
|
#
|
|
# Important boost patch: 094c18b
|
|
#
|
|
|
|
set (LIBRARY_DIR ${ClickHouse_SOURCE_DIR}/contrib/boost)
|
|
|
|
if (NOT MSVC)
|
|
add_definitions(-Wno-unused-variable -Wno-deprecated-declarations)
|
|
endif ()
|
|
|
|
add_library(boost_program_options_internal ${SPLIT_SHARED}
|
|
${LIBRARY_DIR}/libs/program_options/src/cmdline.cpp
|
|
${LIBRARY_DIR}/libs/program_options/src/config_file.cpp
|
|
${LIBRARY_DIR}/libs/program_options/src/convert.cpp
|
|
${LIBRARY_DIR}/libs/program_options/src/options_description.cpp
|
|
${LIBRARY_DIR}/libs/program_options/src/parsers.cpp
|
|
${LIBRARY_DIR}/libs/program_options/src/positional_options.cpp
|
|
${LIBRARY_DIR}/libs/program_options/src/split.cpp
|
|
${LIBRARY_DIR}/libs/program_options/src/utf8_codecvt_facet.cpp
|
|
${LIBRARY_DIR}/libs/program_options/src/value_semantic.cpp
|
|
${LIBRARY_DIR}/libs/program_options/src/variables_map.cpp
|
|
${LIBRARY_DIR}/libs/program_options/src/winmain.cpp)
|
|
|
|
add_library(boost_filesystem_internal ${SPLIT_SHARED}
|
|
${LIBRARY_DIR}/libs/filesystem/src/codecvt_error_category.cpp
|
|
${LIBRARY_DIR}/libs/filesystem/src/operations.cpp
|
|
${LIBRARY_DIR}/libs/filesystem/src/path.cpp
|
|
${LIBRARY_DIR}/libs/filesystem/src/path_traits.cpp
|
|
${LIBRARY_DIR}/libs/filesystem/src/portability.cpp
|
|
${LIBRARY_DIR}/libs/filesystem/src/unique_path.cpp
|
|
${LIBRARY_DIR}/libs/filesystem/src/utf8_codecvt_facet.cpp
|
|
${LIBRARY_DIR}/libs/filesystem/src/windows_file_codecvt.cpp)
|
|
|
|
add_library(boost_system_internal ${SPLIT_SHARED}
|
|
${LIBRARY_DIR}/libs/system/src/error_code.cpp)
|
|
|
|
target_link_libraries (boost_filesystem_internal PRIVATE boost_system_internal)
|
|
|
|
target_include_directories (boost_program_options_internal SYSTEM BEFORE PUBLIC ${Boost_INCLUDE_DIRS})
|
|
target_include_directories (boost_filesystem_internal SYSTEM BEFORE PUBLIC ${Boost_INCLUDE_DIRS})
|
|
target_include_directories (boost_system_internal SYSTEM BEFORE PUBLIC ${Boost_INCLUDE_DIRS})
|
|
|
|
target_compile_definitions (boost_program_options_internal PUBLIC BOOST_SYSTEM_NO_DEPRECATED)
|
|
target_compile_definitions (boost_filesystem_internal PUBLIC BOOST_SYSTEM_NO_DEPRECATED)
|
|
target_compile_definitions (boost_system_internal PUBLIC BOOST_SYSTEM_NO_DEPRECATED)
|