Skip to content

Commit

Permalink
BLD: use geos INSTALL_NAME_DIR for MacOS instead of specifying custom…
Browse files Browse the repository at this point in the history
… LDFLAGS with rpath
  • Loading branch information
jorisvandenbossche committed Mar 11, 2024
1 parent c439168 commit 2e81a8e
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 1 deletion.
1 change: 0 additions & 1 deletion .github/workflows/release.yml
Expand Up @@ -128,7 +128,6 @@ jobs:
CIBW_ENVIRONMENT_MACOS:
GEOS_INSTALL=${{ runner.temp }}/geos-${{ env.GEOS_VERSION }}
GEOS_CONFIG=${{ runner.temp }}/geos-${{ env.GEOS_VERSION }}/bin/geos-config
LDFLAGS=-Wl,-rpath,${{ runner.temp }}/geos-${{ env.GEOS_VERSION }}/lib
MACOSX_DEPLOYMENT_TARGET=10.9
CMAKE_OSX_ARCHITECTURES='${{ matrix.cmake_osx_architectures }}'
CIBW_ENVIRONMENT_WINDOWS:
Expand Down
1 change: 1 addition & 0 deletions ci/install_geos.sh
Expand Up @@ -56,6 +56,7 @@ build_geos(){
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=${GEOS_INSTALL} \
-DCMAKE_INSTALL_LIBDIR=lib \
-DCMAKE_INSTALL_NAME_DIR=${GEOS_INSTALL}/lib \
${BUILD_TESTING} \
..
cmake --build . -j 4
Expand Down

0 comments on commit 2e81a8e

Please sign in to comment.