Ilya Yatsishin
e0d86f8b45
Merge pull request #13708 from qoega/cassandra-macos-rpath
...
Fix cassandra build on macos
2020-08-14 15:49:47 +03:00
Yatsishin Ilya
4c1e5d9d56
Fix cassandra build on macos
2020-08-14 09:25:08 +03:00
Alexey Milovidov
ad20a384c1
Remove useless code
2020-08-14 02:55:10 +03:00
alexey-milovidov
89419ceb9b
Revert "cmake: Add option to fail configuration instead of auto-reconfiguration"
2020-08-13 23:10:06 +03:00
Konstantin Podshumok
d22de6c7e9
cmake: Make sure USE_SIMDJSON default value is in sync with ENABLE_LIBRARIES
...
Signed-off-by: Konstantin Podshumok <kpp.live+signed@gmail.com>
2020-08-09 21:37:46 +03:00
Konstantin Podshumok
fe56697893
cmake: Add option to fail configuration instead of auto-reconfiguration
...
squashed:
find/msgpack.cmake - merge collision fix, trivial
Signed-off-by: Konstantin Podshumok <kpp.live+signed@gmail.com>
2020-08-09 21:37:26 +03:00
robot-clickhouse
a82c0f5371
Auto version update to [20.8.1.1] [54438]
2020-08-07 21:45:49 +03:00
robot-clickhouse
19f3800a55
Auto version update to [20.7.1.4310] [54437]
2020-08-07 21:45:15 +03:00
Alexey Milovidov
cf6ccbc656
Adjustments
2020-08-03 20:44:23 +03:00
Alexey Milovidov
f5f0c788b8
Relax the limit
2020-08-03 00:10:57 +03:00
Alexey Milovidov
cf388cc32f
Slightly lower the limit
2020-08-02 04:35:49 +03:00
Alexey Milovidov
c202691319
Merge branch 'master' into stack-frams-size-limit
2020-07-30 23:53:52 +03:00
alesapin
d52f67d24e
Fix abtesting build
2020-07-29 14:00:04 +03:00
Alexey Milovidov
50bbfc848d
Merge branch 'master' into stack-frams-size-limit
2020-07-21 14:45:15 +03:00
Vitaly Baranov
0b17595a91
Merge pull request #12423 from vitlibar/update-simdjson
...
Update simdjson
2020-07-20 10:15:38 +03:00
Vitaly Baranov
4cc101f1d4
Fix build scripts.
2020-07-17 10:30:13 +03:00
Vitaly Baranov
000b197ad1
Merge pull request #11234 from traceon/ldap-per-user-authentication
...
Add LDAP authentication support
2020-07-16 13:17:21 +03:00
Denis Glazachev
59cb758cf7
Merge branch 'master' into ldap-per-user-authentication
2020-07-16 02:29:24 +04:00
alesapin
e35c49faa2
Merge branch 'master' into fasttest
2020-07-15 22:35:46 +03:00
Alexander Kuzmenkov
3e6b9f297f
Some provisions for Android build
2020-07-15 14:16:00 +03:00
alesapin
a31109f023
Better submdoules
2020-07-14 21:44:57 +03:00
alesapin
0740b88d6b
Merge branch 'master' into fasttest
2020-07-14 15:19:05 +03:00
robot-clickhouse
0f23642a3d
Auto version update to [20.7.1.1] [54437]
2020-07-13 18:26:03 +03:00
robot-clickhouse
0c5be7309c
Auto version update to [20.6.1.4066] [54436]
2020-07-13 18:25:23 +03:00
alesapin
a9824fd650
Better cmake and less libraries
2020-07-10 22:08:18 +03:00
alesapin
4ab5edadb7
Less libraries
2020-07-10 12:47:50 +03:00
Denis Glazachev
5a4762bb8a
Merge branch 'master' into ldap-per-user-authentication
2020-07-09 14:50:02 +04:00
alexey-milovidov
f021376874
Merge pull request #12178 from azat/gcc10-build-fixes
...
gcc10/cmake build fixes
2020-07-09 01:49:07 +03:00
Denis Glazachev
9effacfbc1
Merge branch 'master' into ldap-per-user-authentication
...
* master: (1102 commits)
Update README.md
Update README.md
Update README.md
Update index.md
[docs] add intrdocution for statements page (#12189 )
Revert "Run perf tests with memory sampling (for allocations >1M)"
Sanitize LINK_LIBRARIES property for the directories (#12160 )
[docs] refactor Domains overview (#12186 )
DOCS-647: toStartOfSecond (#12190 )
[docs] add intrdocution for commercial page (#12187 )
DOCSUP-1348 Russian translation for new functions (#133 ) (#12194 )
changelog fixes
Update index.md (#12191 )
Update zh kafka.md title (#12192 )
Added test for #3767
style fix for #12152
Tests for fixed issues #10846 and #7347
changelog fixes
[docs] introduction for special table engines (#12170 )
[docs] introduction for third-party interfaces (#12175 )
...
# Conflicts:
# src/Access/ya.make
# src/Common/ErrorCodes.cpp
2020-07-08 00:42:09 +04:00
Azat Khuzhin
a5cb0aed12
Sanitize LINK_LIBRARIES property for the directories ( #12160 )
...
When you will try to link target with the directory (that exists), cmake will
skip this without an error, only the following warning will be reported:
target_link_libraries(main /tmp)
WARNING: Target "main" requests linking to directory "/tmp". Targets may link only to libraries. CMake is dropping the item.
And there is no cmake policy that controls this.
(I guess the reason that it is allowed is because of FRAMEWORK for OSX).
So to avoid error-prone cmake rules, this can be sanitized.
There are the following ways:
- overwrite target_link_libraries()/link_libraries() and check *before*
calling real macro, but this requires duplicate all supported syntax
-- too complex
- overwrite target_link_libraries() and check LINK_LIBRARIES property, this
works great
-- but cannot be used with link_libraries()
- use BUILDSYSTEM_TARGETS property to get list of all targets and sanitize
-- this will work.
I also tested it with the following patch:
$ git di
diff --git a/base/daemon/CMakeLists.txt b/base/daemon/CMakeLists.txt
index 26d59a57e7..35e6ff6432 100644
--- a/base/daemon/CMakeLists.txt
+++ b/base/daemon/CMakeLists.txt
@@ -9,4 +9,5 @@ target_link_libraries (daemon PUBLIC loggers PRIVATE clickhouse_common_io clickh
if (USE_SENTRY)
target_link_libraries (daemon PRIVATE ${SENTRY_LIBRARY})
+ target_link_libraries (daemon PRIVATE /tmp)
endif ()
And it works:
CMake Error at cmake/sanitize_target_link_libraries.cmake:48 (message):
daemon requested to link with directory: /tmp
Call Stack (most recent call first):
cmake/sanitize_target_link_libraries.cmake:55 (sanitize_link_libraries)
CMakeLists.txt:425 (include)
Refs: #12041
2020-07-07 19:22:41 +03:00
Azat Khuzhin
2d2a34d6cd
Use ENABLE_LIBRARIES option for AMQP-CPP
...
This is tiny fix, there are more problems that just this small little
bit.
2020-07-06 23:34:40 +03:00
alexey-milovidov
1719ab1ec5
Merge pull request #12041 from azat/curl-proper-cmake
...
Rewrite curl dependency in a more ch compatible way
2020-07-06 06:31:51 +03:00
Azat Khuzhin
e6aacaac5c
Do not enable sentry if ENABLE_LIBRARIES is not set
2020-07-04 16:41:22 +03:00
Azat Khuzhin
0700a705bc
Rewrite curl dependency in a more ch compatible way
...
- add support of unbundled curl
- add CURL::libcurl libraries
- avoid explicit linkage of daemon with curl (added with sentry)
- set CACHE variables for non-direct users:
- mariadb-connector-c
- aws-s3-cmake
- sentry-native
Cc: @alexey-milovidov
Cc: @alesapin (requires docker image update)
Cc: @abyss7
Refs: #11300
Refs: #8011
Refs: #8905
v2: replace cmake/find/curl.cmake with proper contrib/curl-cmake (as
pointed by @abyss7, cmake/find/*.cmake is deprecated)
2020-07-03 00:57:08 +03:00
alesapin
64583ceb22
Merge branch 'master' into add-storage-rabbitmq-read-only
2020-07-02 16:08:29 +03:00
kssenii
3d2cc9d4b2
Remove libevent library
2020-06-29 12:11:17 +00:00
alesapin
3fc65b3269
Merge branch 'master' into kssenii-rabbit-mq
2020-06-24 20:14:28 +03:00
Ivan Blinkov
45d1ca2567
merge master
2020-06-24 00:18:16 +03:00
robot-clickhouse
4bd47b8adc
Auto version update to [20.6.1.1] [54436]
2020-06-22 20:40:26 +03:00
robot-clickhouse
bc7f98141f
Auto version update to [20.5.1.3833] [54435]
2020-06-22 20:39:51 +03:00
alexey-milovidov
efc57fb063
Make the comment more readable.
2020-06-22 17:59:38 +03:00
Ivan Blinkov
5f73c87c71
change used flag
2020-06-11 15:18:19 +03:00
kssenii
18820814f5
Merge
2020-06-10 23:25:33 +00:00
Denis Glazachev
9e3a28a6b8
Merge branch 'master' into ldap-per-user-authentication
...
* master: (414 commits)
Update file.md
Update merge.md
Update dictionary.md
Update external-data.md
Update distributed.md
Update null.md
Update set.md
Update join.md
Update url.md
Update view.md
Update materializedview.md
Update memory.md
Update buffer.md
Update generate.md
removed a sentence about global lock during rename (#11577 )
greatCircleAngle en translation (#11584 )
Update configuration-files.md
try fix flacky test
Update why.html
Update rich.html
...
# Conflicts:
# src/Common/ErrorCodes.cpp
# utils/ci/jobs/quick-build/run.sh
2020-06-11 03:06:17 +04:00
Ivan Blinkov
67ccd6703e
maybe fix the unbundled gcc build
2020-06-11 00:03:13 +03:00
Ivan Blinkov
6191d33bd9
Do not cache frames inside StackTrace
2020-06-10 16:30:12 +03:00
Ivan Blinkov
90ee4d52f4
merge master
2020-06-10 13:18:41 +03:00
Ivan Blinkov
f872c639ed
Try to disable linker options from sentry
2020-06-09 20:44:56 +03:00
Alexander Tokmakov
6bb68329f8
Merge branch 'master' into merging_external_source_cassandra
2020-06-09 19:51:14 +03:00
Ivan Blinkov
6f7064928f
Merge branch 'master' of github.com:ClickHouse/ClickHouse into sentry
2020-06-09 19:07:57 +03:00