CMake build system updates #1823
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…FALSE Fixes: ff67c2a Closes: xrootd#1804
This does not seem to be necessary. Eventually CMake will remove the old behavior, so it's better to switch to the new behavior. See "cmake --help-policy CMP0054" for information on this policy.
CMake generates a warning when a find module like Find<package>.cmake uses something other than <package> (case-sensitive) in the call to find_package_handle_standard_args.
XRootD's FindOpenSSL.cmake fails when OpenSSL is not found with the following error: CMake Error at cmake/FindOpenSSL.cmake:15 (file): file STRINGS file "/tmp/xrootd/xrootd/OPENSSL_INCLUDE_DIR-NOTFOUND/openssl/opensslv.h" cannot be read. Call Stack (most recent call first): cmake/XRootDFindLibs.cmake:44 (find_package) CMakeLists.txt:26 (include) CMake Error at cmake/FindOpenSSL.cmake:16 (string): string sub-command REGEX, mode REPLACE needs at least 6 arguments total to command. Call Stack (most recent call first): cmake/XRootDFindLibs.cmake:44 (find_package) CMakeLists.txt:26 (include) Since FindOpenSSL.cmake is already provided upstream by CMake 3.1, we can use that instead and drop our custom module.
The egrep command has been deprecated since 2007. Recently grep started to warn about it, so replace egrep usage with grep -E. See release notes of grep at the link below for more information. https://savannah.gnu.org/forum/forum.php?forum_id=10227
Attempting to upgrade it results in the error below.
Complete output from command python setup.py egg_info:
Traceback (most recent call last):
File "<string>", line 1, in <module>
File "/tmp/pip-build-b24Ztv/wheel/setup.py", line 1
from __future__ import annotations
SyntaxError: future feature annotations is not defined
When not setting CMAKE_{C,CXX}_COMPILER explicitly, the default
ones (cc and c++) are picked up, but are not properly setup to
find headers, which causes build failures of the Python bindings.
amadio
force-pushed
the
cmake
branch
2 times, most recently
from
710c0c3
to
fa7a2e1
Compare
This is required as by default the installed Python doesn't know about XRootD which was installed into /usr/local/lib/python3.X. Using a local installation we can work around it. Note that we cannot set --user in PIP_OPTIONS as it conflicts with --prefix, which is added by the build system in bindings/python/CMakeLists.txt.
simonmichal
reviewed
Nov 10, 2022
amadio
commented
Nov 10, 2022
amadio
commented
Nov 10, 2022
This ensures that the right function is used with both shared and static libraries, as CMake's check_symbol_exists() doesn't work with static libraries. The release notes for OpenSSL 1.1.0 mention the deprecation of the old function and recommends using the new TLS_method(). More information at https://www.openssl.org/news/cl111.txt.
|
Turned out that removing the @simonmichal We could remove the |
simonmichal
approved these changes
Nov 11, 2022
|
Look's good, again thanks for the PR :-) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
These are mostly fixes for warnings with newer versions of CMake. I'm also picking the fix for #1804 to apply onto master.