thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-20 00:30:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
62cfe39b9d
ClickHouse/contrib/CMakeLists.txt

90 lines
2.3 KiB
CMake
Raw Normal View History

cmake: More options. [#METR-23701]
2016-12-01 22:44:59 +00:00
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-old-style-cast")
add -Wold-style-cast
2016-08-25 21:55:02 +00:00
Dont build internal boost if USE_INTERNAL_BOOST_LIBRARY=FALSE
2016-12-20 13:48:32 +00:00
if (USE_INTERNAL_BOOST_LIBRARY)
Fix mysql includes and remove libmariadb submodule (#1185) * Use bundled libmariadbclient (CLICKHOUSE-3261) * wip * wip * wip * Update docs about git clone. move docs/en/development/build_*.sh -> utils/build/build_debian.sh * Fix mysql includes * Cmake: don't install mariadb targets * Fix generated includes * Disable mysql tests * cmake: mariadb fixes * Fix * Update find_mysqlclient.cmake * Fix zlib * Remove bundled contrib/mariadb-connector-c * fix * Fix build * Fix includes
2017-09-04 17:04:33 +00:00
add_subdirectory (libboost)
Dont build internal boost if USE_INTERNAL_BOOST_LIBRARY=FALSE
2016-12-20 13:48:32 +00:00
endif ()
Allow build with external double-conversion lz4 zstd re2 zookeeper (#531) * Allow build with external double-conversion lz4 zstd re2 zookeeper * fix * fix * freebsd fixes * spaces * fix * fix * fix * wip * move * fix
2017-02-28 23:49:04 +00:00
if (USE_INTERNAL_LZ4_LIBRARY)
zstd, lz4 as submodule (#1214) * Contrib: use zstd, lz4 as submodule * fix shared build * re-test me. * wip * Update CHANGELOG_RU.md * Update CHANGELOG.md * Update CHANGELOG_RU.md * Whitespaces [#CLICKHOUSE-2]. * Implemented TODO [#CLICKHOUSE-2]. * Whitespaces [#CLICKHOUSE-2]. * Remove wrong test * Implemented TODO [#CLICKHOUSE-2]. * Moved chown to correct place [#CLICKHOUSE-2]. * Resolves #1273. Exception safe users update. [#CLICKHOUSE-3] * Less noisy logging. [#CLICKHOSUE-2] * Add metrics for RWLockFIFO. [#CLICKHOUSE-3246] * Executable dictionaries: fail if program returns non zero exit code (#CLICKHOUSE-3171) * Add better logging if OPTIMIZE cannot be executed. [#CLICKHOUSE-2] * test me * Fixing documentation fragment about "default" user. It is not mandatory anymore. * append yurial/clickhouse-client to docs/interfaces * Fixed FREEZE PARTITION: using only active data parts; acquire snapshot of parts [#CLICKHOUSE-3369]. * Removed tcp_ssl_port by default [#CLICKHOUSE-2]. * Update MergeTreeDataMerger.cpp * Update ShellCommand.cpp * Disable part sendings and fetches before ALTER. [#CLICKHOUSE-3343] * Update ExecutableDictionarySource.cpp * Update ExecutableDictionarySource.cpp * Miscellaneous changes after merge [#CLICKHOUSE-2]. * Improve tests: allow redefine some values (clickhouse path, ports, ...) * Received signal Segmentation fault (#1300) (#1302) * Received signal Segmentation fault (#1300) * Add test * Tests: Use new possibly redefined values from env (in 2 tests) * Proper fix for the issue: better exception message [#CLICKHOUSE-2]. * Split GatherUtils.cpp for faster compile (#1312) * Split GatherUtils.cpp for faster compile * remove GatherUtils.cpp * Fix array writing (#1314) * changed MergedBlockOutputStream [#CLICKHOUSE-3341] * fix build [#CLICKHOUSE-3341] * fix build [#CLICKHOUSE-3341] * fix build [#CLICKHOUSE-3341] * fix build [#CLICKHOUSE-3341] * fix build [#CLICKHOUSE-3341] * fix build [#CLICKHOUSE-3341] * fix build [#CLICKHOUSE-3341] * fix build [#CLICKHOUSE-3341] * fix build [#CLICKHOUSE-3341] * disabled checkNoMultidimensionalArrays [#CLICKHOUSE-3341] * fix IMergedBlockOutputStream::writeDataImpl [#CLICKHOUSE-3341] * fix IMergedBlockOutputStream::writeDataImpl [#CLICKHOUSE-3341] * fix IMergedBlockOutputStream::writeDataImpl [#CLICKHOUSE-3341] * fix IMergedBlockOutputStream::writeDataImpl [#CLICKHOUSE-3341] * added test [#CLICKHOUSE-3341] * fixed test [#CLICKHOUSE-3341] * refactoring and comments [#CLICKHOUSE-3341] * fix build [#CLICKHOUSE-3341] * Update ColumnArray.h * Update ActionBlocker.h * Fix section tabulation * Fixed infinite recursion in expression analyzer. [#CLICKHOUSE-3125] * Update ActionBlocker.h * Improvement [#CLICKHOUSE-2]. * Try fix strange terminate (#1329) * Tests: External: rename --use_http => --no_http and fix * Try fix strange terminate * Misc [#CLICKHOUSE-2]. * Fix compile CallPointInPolygon on clang4 (Thanks to @vavrusa) (#1333) * Fix compile with boost 1.65.1+ and clang 3.8 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=222439 ) * Fix compile CallPointInPolygon on clang4 (Thanks to @vavrusa) * Fix complex queries with GLOBAL IN and UNION ALL (#CLICKHOUSE-3356) (#1339) * TEST only: why initQueryAnalyzer ? * Better tests * missing file * Missing file * Add test * Test fixes * Fixed FREEZE PARTITION: using only active data parts; acquire snapshot of parts [#CLICKHOUSE-3369]. * Removed tcp_ssl_port by default [#CLICKHOUSE-2]. * Better tests * comment * clean * REmove wrong code * clean * dbms: Added compression level for ZSTD. [#METR-26742] * dbms: CompressionSettingsSelector. [#METR-21516] * dbms: Minor fix. [#METR-21516] * Fix SummingMergeTree argument checking logic. This patch fixes the Nested Column Name checking logic, which allows nested columns be explicitly specified in SummingMergeTree engine.
2017-10-13 18:52:23 +00:00
add_subdirectory (lz4-cmake)
Allow build with external double-conversion lz4 zstd re2 zookeeper (#531) * Allow build with external double-conversion lz4 zstd re2 zookeeper * fix * fix * freebsd fixes * spaces * fix * fix * fix * wip * move * fix
2017-02-28 23:49:04 +00:00
endif ()
if (USE_INTERNAL_ZSTD_LIBRARY)
zstd, lz4 as submodule (#1214) * Contrib: use zstd, lz4 as submodule * fix shared build * re-test me. * wip * Update CHANGELOG_RU.md * Update CHANGELOG.md * Update CHANGELOG_RU.md * Whitespaces [#CLICKHOUSE-2]. * Implemented TODO [#CLICKHOUSE-2]. * Whitespaces [#CLICKHOUSE-2]. * Remove wrong test * Implemented TODO [#CLICKHOUSE-2]. * Moved chown to correct place [#CLICKHOUSE-2]. * Resolves #1273. Exception safe users update. [#CLICKHOUSE-3] * Less noisy logging. [#CLICKHOSUE-2] * Add metrics for RWLockFIFO. [#CLICKHOUSE-3246] * Executable dictionaries: fail if program returns non zero exit code (#CLICKHOUSE-3171) * Add better logging if OPTIMIZE cannot be executed. [#CLICKHOUSE-2] * test me * Fixing documentation fragment about "default" user. It is not mandatory anymore. * append yurial/clickhouse-client to docs/interfaces * Fixed FREEZE PARTITION: using only active data parts; acquire snapshot of parts [#CLICKHOUSE-3369]. * Removed tcp_ssl_port by default [#CLICKHOUSE-2]. * Update MergeTreeDataMerger.cpp * Update ShellCommand.cpp * Disable part sendings and fetches before ALTER. [#CLICKHOUSE-3343] * Update ExecutableDictionarySource.cpp * Update ExecutableDictionarySource.cpp * Miscellaneous changes after merge [#CLICKHOUSE-2]. * Improve tests: allow redefine some values (clickhouse path, ports, ...) * Received signal Segmentation fault (#1300) (#1302) * Received signal Segmentation fault (#1300) * Add test * Tests: Use new possibly redefined values from env (in 2 tests) * Proper fix for the issue: better exception message [#CLICKHOUSE-2]. * Split GatherUtils.cpp for faster compile (#1312) * Split GatherUtils.cpp for faster compile * remove GatherUtils.cpp * Fix array writing (#1314) * changed MergedBlockOutputStream [#CLICKHOUSE-3341] * fix build [#CLICKHOUSE-3341] * fix build [#CLICKHOUSE-3341] * fix build [#CLICKHOUSE-3341] * fix build [#CLICKHOUSE-3341] * fix build [#CLICKHOUSE-3341] * fix build [#CLICKHOUSE-3341] * fix build [#CLICKHOUSE-3341] * fix build [#CLICKHOUSE-3341] * fix build [#CLICKHOUSE-3341] * disabled checkNoMultidimensionalArrays [#CLICKHOUSE-3341] * fix IMergedBlockOutputStream::writeDataImpl [#CLICKHOUSE-3341] * fix IMergedBlockOutputStream::writeDataImpl [#CLICKHOUSE-3341] * fix IMergedBlockOutputStream::writeDataImpl [#CLICKHOUSE-3341] * fix IMergedBlockOutputStream::writeDataImpl [#CLICKHOUSE-3341] * added test [#CLICKHOUSE-3341] * fixed test [#CLICKHOUSE-3341] * refactoring and comments [#CLICKHOUSE-3341] * fix build [#CLICKHOUSE-3341] * Update ColumnArray.h * Update ActionBlocker.h * Fix section tabulation * Fixed infinite recursion in expression analyzer. [#CLICKHOUSE-3125] * Update ActionBlocker.h * Improvement [#CLICKHOUSE-2]. * Try fix strange terminate (#1329) * Tests: External: rename --use_http => --no_http and fix * Try fix strange terminate * Misc [#CLICKHOUSE-2]. * Fix compile CallPointInPolygon on clang4 (Thanks to @vavrusa) (#1333) * Fix compile with boost 1.65.1+ and clang 3.8 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=222439 ) * Fix compile CallPointInPolygon on clang4 (Thanks to @vavrusa) * Fix complex queries with GLOBAL IN and UNION ALL (#CLICKHOUSE-3356) (#1339) * TEST only: why initQueryAnalyzer ? * Better tests * missing file * Missing file * Add test * Test fixes * Fixed FREEZE PARTITION: using only active data parts; acquire snapshot of parts [#CLICKHOUSE-3369]. * Removed tcp_ssl_port by default [#CLICKHOUSE-2]. * Better tests * comment * clean * REmove wrong code * clean * dbms: Added compression level for ZSTD. [#METR-26742] * dbms: CompressionSettingsSelector. [#METR-21516] * dbms: Minor fix. [#METR-21516] * Fix SummingMergeTree argument checking logic. This patch fixes the Nested Column Name checking logic, which allows nested columns be explicitly specified in SummingMergeTree engine.
2017-10-13 18:52:23 +00:00
add_subdirectory (zstd-cmake)
Allow build with external double-conversion lz4 zstd re2 zookeeper (#531) * Allow build with external double-conversion lz4 zstd re2 zookeeper * fix * fix * freebsd fixes * spaces * fix * fix * fix * wip * move * fix
2017-02-28 23:49:04 +00:00
endif ()
if (USE_INTERNAL_RE2_LIBRARY)
Fix mysql includes and remove libmariadb submodule (#1185) * Use bundled libmariadbclient (CLICKHOUSE-3261) * wip * wip * wip * Update docs about git clone. move docs/en/development/build_*.sh -> utils/build/build_debian.sh * Fix mysql includes * Cmake: don't install mariadb targets * Fix generated includes * Disable mysql tests * cmake: mariadb fixes * Fix * Update find_mysqlclient.cmake * Fix zlib * Remove bundled contrib/mariadb-connector-c * fix * Fix build * Fix includes
2017-09-04 17:04:33 +00:00
add_subdirectory (libre2)
Allow build with external double-conversion lz4 zstd re2 zookeeper (#531) * Allow build with external double-conversion lz4 zstd re2 zookeeper * fix * fix * freebsd fixes * spaces * fix * fix * fix * wip * move * fix
2017-02-28 23:49:04 +00:00
endif ()
if (USE_INTERNAL_DOUBLE_CONVERSION_LIBRARY)
Fix mysql includes and remove libmariadb submodule (#1185) * Use bundled libmariadbclient (CLICKHOUSE-3261) * wip * wip * wip * Update docs about git clone. move docs/en/development/build_*.sh -> utils/build/build_debian.sh * Fix mysql includes * Cmake: don't install mariadb targets * Fix generated includes * Disable mysql tests * cmake: mariadb fixes * Fix * Update find_mysqlclient.cmake * Fix zlib * Remove bundled contrib/mariadb-connector-c * fix * Fix build * Fix includes
2017-09-04 17:04:33 +00:00
add_subdirectory (libdouble-conversion)
Allow build with external double-conversion lz4 zstd re2 zookeeper (#531) * Allow build with external double-conversion lz4 zstd re2 zookeeper * fix * fix * freebsd fixes * spaces * fix * fix * fix * wip * move * fix
2017-02-28 23:49:04 +00:00
endif ()
if (USE_INTERNAL_ZOOKEEPER_LIBRARY)
zookeeper 3.4.10 as submodule (#1304) * zookeeper 3.4.10 as submodule * fix * Apply patch
2017-10-13 19:02:41 +00:00
add_subdirectory (zookeeper/src/c)
Allow build with external double-conversion lz4 zstd re2 zookeeper (#531) * Allow build with external double-conversion lz4 zstd re2 zookeeper * fix * fix * freebsd fixes * spaces * fix * fix * fix * wip * move * fix
2017-02-28 23:49:04 +00:00
endif ()
Cmake: link ltdl with pocoodbc static only. rename ARM -> ARCH_ARM (#1083) * Cmake: link ltdl with pocoodbc static only. rename ARM -> ARCH_ARM * Fix lib find order * Allow define non-contrib cityhash farmhash metrohash * Fix message * Cmake: fixes * clean * Update CMakeLists.txt
2017-08-09 20:52:55 +00:00
if (USE_INTERNAL_CITYHASH_LIBRARY)
add_subdirectory (libcityhash)
endif ()
if (USE_INTERNAL_FARMHASH_LIBRARY)
add_subdirectory (libfarmhash)
endif ()
if (USE_INTERNAL_METROHASH_LIBRARY)
add_subdirectory (libmetrohash)
endif ()
if (USE_INTERNAL_BTRIE_LIBRARY)
add_subdirectory (libbtrie)
endif ()
Make libunwind optional. Allow use custom libcctz (#920) * Make libunwind optional. Allow use custom libcctz * fix * Fix * fix * Update BaseDaemon.cpp * Update CMakeLists.txt
2017-06-23 14:41:07 +00:00
if (USE_INTERNAL_UNWIND_LIBRARY)
Fix mysql includes and remove libmariadb submodule (#1185) * Use bundled libmariadbclient (CLICKHOUSE-3261) * wip * wip * wip * Update docs about git clone. move docs/en/development/build_*.sh -> utils/build/build_debian.sh * Fix mysql includes * Cmake: don't install mariadb targets * Fix generated includes * Disable mysql tests * cmake: mariadb fixes * Fix * Update find_mysqlclient.cmake * Fix zlib * Remove bundled contrib/mariadb-connector-c * fix * Fix build * Fix includes
2017-09-04 17:04:33 +00:00
add_subdirectory (libunwind)
Make libunwind optional. Allow use custom libcctz (#920) * Make libunwind optional. Allow use custom libcctz * fix * Fix * fix * Update BaseDaemon.cpp * Update CMakeLists.txt
2017-06-23 14:41:07 +00:00
endif ()
Allow build with external double-conversion lz4 zstd re2 zookeeper (#531) * Allow build with external double-conversion lz4 zstd re2 zookeeper * fix * fix * freebsd fixes * spaces * fix * fix * fix * wip * move * fix
2017-02-28 23:49:04 +00:00
cmake: USE_INTERNAL_ZLIB_LIBRARY (#463) * Correct fix of building with external poco with disabled sending progress Revert "Removed wrong code [#CLICKHOUSE-2]." This reverts commit 33f9917f530a8395863d793c70ff73c7d2c5c633. * fix * fix * cmake: USE_INTERNAL_ZLIB_LIBRARY
2017-02-07 21:28:13 +00:00
if (USE_INTERNAL_ZLIB_LIBRARY)
Zlib: as submodule, fix compile options; config: add logger options: logger.flush logger.rotateOnOpen
2017-11-21 17:46:28 +00:00
add_subdirectory (zlib-ng)
# todo: make pull to Dead2/zlib-ng and remove:
# We should use same defines when including zlib.h as used when zlib compiled
target_compile_definitions (zlib PUBLIC ZLIB_COMPAT WITH_GZFILEOP)
target_compile_definitions (zlibstatic PUBLIC ZLIB_COMPAT WITH_GZFILEOP)
Zlib: remove unused test targets
2017-11-22 12:15:17 +00:00
set_target_properties(example PROPERTIES EXCLUDE_FROM_ALL 1)
set_target_properties(minigzip PROPERTIES EXCLUDE_FROM_ALL 1)
Fix macos build
2017-11-24 19:24:07 +00:00
if (TARGET example64)
set_target_properties(example64 PROPERTIES EXCLUDE_FROM_ALL 1)
endif ()
if (TARGET minigzip64)
set_target_properties(minigzip64 PROPERTIES EXCLUDE_FROM_ALL 1)
endif ()
cmake: USE_INTERNAL_ZLIB_LIBRARY (#463) * Correct fix of building with external poco with disabled sending progress Revert "Removed wrong code [#CLICKHOUSE-2]." This reverts commit 33f9917f530a8395863d793c70ff73c7d2c5c633. * fix * fix * cmake: USE_INTERNAL_ZLIB_LIBRARY
2017-02-07 21:28:13 +00:00
endif ()
Make libunwind optional. Allow use custom libcctz (#920) * Make libunwind optional. Allow use custom libcctz * fix * Fix * fix * Update BaseDaemon.cpp * Update CMakeLists.txt
2017-06-23 14:41:07 +00:00
if (USE_INTERNAL_CCTZ_LIBRARY)
contrib: cctz as submodule. update cctz.
2017-11-02 18:55:52 +00:00
add_subdirectory (cctz-cmake)
Make libunwind optional. Allow use custom libcctz (#920) * Make libunwind optional. Allow use custom libcctz * fix * Fix * fix * Update BaseDaemon.cpp * Update CMakeLists.txt
2017-06-23 14:41:07 +00:00
endif ()
Removed sensitive data.
2016-02-07 21:58:58 +00:00
ENABLE_LIBTCMALLOC -> ENABLE_TCMALLOC (#1558) * Cmake: clang + libc++ fixes * Cmake: fix link of some tests (missing pthread) * Use -pthread flag for compile * ENABLE_LIBTCMALLOC -> ENABLE_TCMALLOC
2017-11-28 19:57:15 +00:00
if (ENABLE_TCMALLOC AND USE_INTERNAL_GPERFTOOLS_LIBRARY)
Revert "Make gperftools (libtcmalloc) as submodule and update. (#1381)" This reverts commit fa2484ea90f99811492642e05f29cbf8265049d7.
2017-10-24 19:18:15 +00:00
add_subdirectory (libtcmalloc)
cmake: More options. [#METR-23701]
2016-12-01 22:44:59 +00:00
endif ()
Build improvement [#METRIQA-526].
2016-11-28 15:35:13 +00:00
Cmake: link ltdl with pocoodbc static only. rename ARM -> ARCH_ARM (#1083) * Cmake: link ltdl with pocoodbc static only. rename ARM -> ARCH_ARM * Fix lib find order * Allow define non-contrib cityhash farmhash metrohash * Fix message * Cmake: fixes * clean * Update CMakeLists.txt
2017-08-09 20:52:55 +00:00
if (NOT ARCH_ARM)
Fix mysql includes and remove libmariadb submodule (#1185) * Use bundled libmariadbclient (CLICKHOUSE-3261) * wip * wip * wip * Update docs about git clone. move docs/en/development/build_*.sh -> utils/build/build_debian.sh * Fix mysql includes * Cmake: don't install mariadb targets * Fix generated includes * Disable mysql tests * cmake: mariadb fixes * Fix * Update find_mysqlclient.cmake * Fix zlib * Remove bundled contrib/mariadb-connector-c * fix * Fix build * Fix includes
2017-09-04 17:04:33 +00:00
add_subdirectory (libcpuid)
libmariadb as submodule (CLICKHOUSE-3261) (#1181) * Use bundled libmariadbclient (CLICKHOUSE-3261) * wip * wip * wip * Update docs about git clone. move docs/en/development/build_*.sh -> utils/build/build_debian.sh
2017-08-31 17:11:30 +00:00
endif ()
contrib: include librdkafka as submodule
2017-10-06 04:40:18 +00:00
if (USE_INTERNAL_RDKAFKA_LIBRARY)
Optional kafka (#1355) * Zookeeper include fix * Update submodule contrib/poco * Fix zookeeper submodule ho-to-make doc * Update zookeeper submodule * Update submodule zookeeper * Fix compile with external zookeeper * Optional kafka * fix * Fix * fix
2017-10-14 00:53:01 +00:00
set(RDKAFKA_BUILD_EXAMPLES OFF CACHE BOOL "")
set(RDKAFKA_BUILD_TESTS OFF CACHE BOOL "")
contrib: include librdkafka as submodule
2017-10-06 04:40:18 +00:00
mark_as_advanced(ZLIB_INCLUDE_DIR)
add_subdirectory (librdkafka)
Update CMakeLists.txt
2017-10-13 19:24:37 +00:00
endif ()
Merge branch 'master' into upstream-add-kafka
2017-10-13 20:52:42 +00:00
Updating poco and making submodule (#1263) * Updating poco part 1: use submodule * switch to tmp submodule * update submodule * wip * wip * wip * wip * wip * fix * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * test * wip * wip * wip * wip * wip * wip * Remove werror * wip * wip * wip * wip * wip * Block pipe signal * Update poco * Update and fix poco * Better sigpipe handler * Better block sigpipe * Update BaseDaemon.cpp
2017-10-13 18:58:19 +00:00
if (USE_INTERNAL_POCO_LIBRARY)
set (_save ${ENABLE_TESTS})
set (ENABLE_TESTS 0)
set (CMAKE_DISABLE_FIND_PACKAGE_ZLIB 1)
add_subdirectory (poco)
unset (CMAKE_DISABLE_FIND_PACKAGE_ZLIB)
set (ENABLE_TESTS ${_save})
endif ()
Reference in New Issue Copy Permalink