Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

More cmake external modules cleanups #33842

Merged
merged 45 commits into from
Jan 22, 2022
Merged

More cmake external modules cleanups #33842

merged 45 commits into from
Jan 22, 2022

Conversation

azat
Copy link
Collaborator

@azat azat commented Jan 20, 2022 •
edited

Changelog category (leave one):

  • Not for changelog (changelog entry is not required)

Changelog entry (a user-readable short description of the changes that goes to CHANGELOG.md):
More cmake external modules cleanups

So now every contrib library that:

  • has it's own cmake (one of exceptions is LLVM)
  • not cxx/cxxabi/unwind

Has:

  • "hidden" libraries (prefixed with _)
  • uses ALIAS library (with ch_contrib:: prefix)

This will avoid hiding errors due to:

  • non existing libraries
  • non existing variables (i.e. LIB_INCLUDE)

Follow-up for: #33690
Cc: @amosbird
Cc: @alexey-milovidov

@robot-clickhouse robot-clickhouse added the pr-not-for-changelog This PR should not be mentioned in the changelog label Jan 20, 2022
@azat
contrib/re2: add a note about name of the libraries
f44d960 
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
@azat
contrib/fmtlib: use hidden library
b003eb7 
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
@azat
contrib/croaring: add a cmake ALIAS library
6604db3 
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
@azat
contrib/abseil: add cmake ALIAS library
d25b598 
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
@azat
contrib/aws-s3: use hidden libraries
5c8f0f6 
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
@azat
contrib/base64: use hidden libraries
cf7d354 
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
@azat
contrib/boringssl: use hidden libraries
110afa4 
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
@azat
contrib/capnproto: use hidden libraries
959d2ce 
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
@azat
contrib/cassandra: use hidden libraries
7a9e927 
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
@azat
contrib/cctz: use hidden libraries
f01d5b7 
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
@azat
contrib/consistent-hashing: add ALIAS library
81880ac 
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
@azat
contrib/curl: cleanup cmake
a2b7e0e 
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
@azat
contrib/cyrus-sasl: use hidden library
3c0ca15 
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
@azat
contrib/dragonbox: add ALIAS library
2aa7fb2 
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
@azat
contrib/fast_float: use hidden library
eb45c7f 
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
@azat
contrib/fastops: use hidden library
8683ad1 
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
@azat
contrib/h3: use hidden library
53a9778 
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
@azat
contrib/hyperscan: use hidden library
f8f6ad1 
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
@azat
contrib/jemalloc: use hidden library
eba6366 
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
@azat
contrib/krb5: use hidden library
0b3f1b9 
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
@azat
contrib/lemmagen-c: use hidden library
f4e437f 
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
@azat
contrib/libcpuid: use hidden library
e8365a4 
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
@azat
contrib/libdivide: add ALIAS library
03fc389 
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
@azat
contrib/libgsasl: add hidden library
dd9be82 
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
@azat
contrib/libmetrohash: add ALIAS library
dc7affd 
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
@azat
contrib/libpq: use hidden library
4114a17 
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
@azat
contrib/libpqxx: use hidden library
62631c0 
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
@azat
contrib/libstemmer-c: use hidden library
e0690bf 
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
@azat
contrib/libxml2: use hidden library
ccf5f18 
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
@azat
contrib/magic-enum: use hidden library
6f16109 
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
@azat
contrib/murmurhash: add ALIAS library
e81586c 
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
@azat
contrib/nanodbc: add hidden library
bbf8039 
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
@azat
contrib/sentry-native: use hidden library
12a0c2b 
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
@azat
contrib/sqlite: add hidden library
f907b5c 
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
@azat
contrib/stats: remove obsolete contrib module
5448188 
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
@azat
contrib/mariadb-connector-c: use hidden library
28fb8fa 
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
@azat
contrib/replxx: use hidden library
bd8b422 
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
@azat
contrib/wordnet-blast: use hidden library
d7bacb6 
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
@azat
contrib/yaml-cpp: use hidden library
39b9706 
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
@azat
contrib/zlib-ng: cleanup cmake rules
94951ea 
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
@azat
contrib/unixodbc: use hidden library
23f82c1 
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
@azat
contrib/protobuf: use hidden libraries
97c3a85 
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
@azat
cmake/print_include_directories.cmake: remove (no copy_headers.sh any…
1a2f7b4 
…more)

Introduced in eb552f2, copy_headers.sh
was relied on it.

Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
@azat
cmake: do not allow internal libstdc++ usage
4f8438b 
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
@azat
check-style: add a note about find_path/find_library check
5c8d027 
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
@azat
Copy link
Collaborator Author

azat commented Jan 21, 2022

Perfectly green CI (9868d601b6a9174bc0313d5cc10c74ee430f9689), but again some conflicts (#33848). Rebased.

@azat
Copy link
Collaborator Author

azat commented Jan 22, 2022

CI had been passed.

@alexey-milovidov alexey-milovidov self-assigned this Jan 22, 2022
@alexey-milovidov alexey-milovidov merged commit eb6849f into ClickHouse:master Jan 22, 2022
@azat azat deleted the cmake-contrib-fixes branch January 24, 2022 10:02
@azat azat mentioned this pull request Jan 31, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alexey-milovidov alexey-milovidov alexey-milovidov approved these changes

Assignees

@alexey-milovidov alexey-milovidov

Labels
pr-not-for-changelog This PR should not be mentioned in the changelog
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@azat @alexey-milovidov @robot-clickhouse