diff --git a/.github/workflows/build_and_run_tests.yml b/.github/workflows/build_and_run_tests.yml index 15241a18..7ecee370 100644 --- a/.github/workflows/build_and_run_tests.yml +++ b/.github/workflows/build_and_run_tests.yml @@ -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: diff --git a/CMakeLists.txt b/CMakeLists.txt index 7ce8a05f..05ec0cac 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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()