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

CMake build system updates #1823

Merged
merged 10 commits into from
Nov 11, 2022
Merged

CMake build system updates #1823

Changes from 3 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0a5c36b
[CMake] Make switches for server-only options dependent on XRCL_ONLY=…
amadio Oct 20, 2022
4177404
[CMake] Drop setting of CMP0054 policy to OLD behavior
amadio Nov 8, 2022
180d08e
[CMake] Fix warnings due to package name mismatches in find modules
amadio Nov 8, 2022
2083b95
[CMake] Use upstream FindOpenSSL.cmake
amadio Nov 8, 2022
957a08e
Replace usage of deprecated egrep command with grep -E
amadio Nov 8, 2022
915d91f
[CI] Skip step to upgrade wheel for Python 2.x
amadio Nov 9, 2022
2a8e04e
[CI] Explicitly set clang/clang++ as C/C++ compilers for macOS
amadio Nov 9, 2022
a70e340
[CI] Use CMAKE_PREFIX_PATH to simplify finding openssl 3 on macOS
amadio Nov 9, 2022
e3d11dc
[CI] Perform a local installation of Python bindings for testing on Mac
amadio Nov 9, 2022
49d1dd9
[XrdTls] Replace "#ifdef HAVE_TLS" with a version-based check
amadio Nov 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 4 additions & 5 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ jobs:
container: centos:7

steps:
# python2-pip is broken on CentOS so can't upgrade pip or setuptools
# python2-pip is broken on CentOS so can't upgrade pip, setuptools, or wheel
- name: Install external dependencies with yum
run: |
yum update -y
Expand All @@ -195,7 +195,6 @@ jobs:
git \
cppunit-devel
yum clean all
python2 -m pip --no-cache-dir install --upgrade wheel

# Need to use v1 of action as image Git is too old
- name: Clone repository now that Git is available
Expand Down Expand Up @@ -334,10 +333,10 @@ jobs:
run: |
cd ..
cmake \
-DCMAKE_C_COMPILER=clang \
-DCMAKE_CXX_COMPILER=clang++ \
-DCMAKE_INSTALL_PREFIX=/usr/local/ \
-DOPENSSL_SSL_LIBRARY=$(find $(find $(brew --cellar openssl) -type d -iname "lib") -type f -iname "libssl*.dylib") \
-DOPENSSL_CRYPTO_LIBRARY=$(find $(find $(brew --cellar openssl) -type d -iname "lib") -type f -iname "libcrypto*.dylib") \
-DOPENSSL_INCLUDE_DIR=$(find $(brew --cellar openssl) -type d -iname "include") \
-DCMAKE_PREFIX_PATH=/usr/local/opt/openssl@3 \
-DPYTHON_EXECUTABLE=$(command -v python3) \
-DENABLE_TESTS=ON \
-DPIP_OPTIONS="--verbose" \
Expand Down