Skip to content

Commit

Permalink
💩 Disable OpenSSL on Mac for now as it doesn't work anymore
Browse files Browse the repository at this point in the history
  • Loading branch information
JulesFouchy committed May 6, 2024
1 parent ff206b1 commit 131cd3c
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 17 deletions.
8 changes: 0 additions & 8 deletions .github/workflows/build_and_run_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,14 +69,6 @@ jobs:
sudo apt-get install -y libssl-dev
sudo apt-get install -y libpulse-dev libasound2-dev
- name: Install MacOS dependencies
if: runner.os == 'MacOS'
run: |
brew install openssl@3.0
brew unlink openssl@3
echo 'export PATH="/opt/homebrew/opt/openssl@3.0/bin:$PATH"' >> /Users/runner/.bash_profile
export PKG_CONFIG_PATH="/opt/homebrew/opt/openssl@3.0/lib/pkgconfig"
- name: ccache
uses: hendrikmuhs/ccache-action@main
with:
Expand Down
16 changes: 7 additions & 9 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -64,17 +64,15 @@ set(COOLLAB_REQUIRE_ALL_FEATURES OFF CACHE BOOL "Some features are optional, lik
# Set the path to OpenSSL library directory
set(OPENSSL_USE_STATIC_LIBS TRUE)

if(APPLE)
find_package(OpenSSL 3.0 EXACT) # Otherwise finds 3.3 which isn't compatible with cpp-httplib
else()
if(NOT APPLE) # Disabled on Mac for now, because brew installs versions 3.3 now, which isn't compatible with cpp-httplib
find_package(OpenSSL 3)
endif()

if(NOT OpenSSL_FOUND)
if(COOLLAB_REQUIRE_ALL_FEATURES)
find_package(OpenSSL 1.1.1 REQUIRED)
else()
find_package(OpenSSL 1.1.1)
if(NOT OpenSSL_FOUND)
if(COOLLAB_REQUIRE_ALL_FEATURES)
find_package(OpenSSL 1.1.1 REQUIRED)
else()
find_package(OpenSSL 1.1.1)
endif()
endif()
endif()

Expand Down

0 comments on commit 131cd3c

Please sign in to comment.