diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cd04dcfb..a6568869 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -556,9 +556,6 @@ jobs: - name: Build shell: bash run: | - # NOTE: cmake does not support autodetection of OPENSSL_ROOT_DIR via brew - export OPENSSL_ROOT_DIR=/usr/local/opt/openssl - if [ "${{ matrix.EVENT_MATRIX }}" == "DISABLE_OPENSSL" ]; then EVENT_CMAKE_OPTIONS="-DEVENT__DISABLE_OPENSSL=ON" @@ -583,7 +580,7 @@ jobs: else EVENT_CMAKE_OPTIONS="" fi - EVENT_CMAKE_OPTIONS="$EVENT_CMAKE_OPTIONS -DMBEDTLS_ROOT_DIR=/usr/local/opt/mbedtls@2" + EVENT_CMAKE_OPTIONS="$EVENT_CMAKE_OPTIONS -DMBEDTLS_ROOT_DIR=`brew --prefix mbedtls@2`" mkdir -p build cd build @@ -641,8 +638,8 @@ jobs: - name: Build shell: bash run: | - export CPPFLAGS="-I/usr/local/opt/mbedtls@2/include" - export LDFLAGS="-L/usr/local/opt/mbedtls@2/lib" + export CPPFLAGS="-I`brew --prefix mbedtls@2`/include" + export LDFLAGS="-L`brew --prefix mbedtls@2`/lib" ./autogen.sh mkdir -p build diff --git a/test-export/test-export.py b/test-export/test-export.py index efeac0cc..6d50e75a 100644 --- a/test-export/test-export.py +++ b/test-export/test-export.py @@ -55,8 +55,8 @@ def link_and_run(link, code): if vcpkg_root is not None: vcpkg = f"-DCMAKE_TOOLCHAIN_FILE={vcpkg_root}/scripts/buildsystems/vcpkg.cmake" elif platform.system() == "Darwin": - openssldir = '-DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' - mbedtlsdir = '-DMBEDTLS_ROOT_DIR=/usr/local/opt/mbedtls@2' + openssldir = '-DOPENSSL_ROOT_DIR=/opt/homebrew/opt/openssl' + mbedtlsdir = '-DMBEDTLS_ROOT_DIR=/opt/homebrew/opt/mbedtls@2' cmd = f"cmake .." \ f" {arch}" \ f" {vcpkg}" \