diff options
| author | Mike Taves <mwtoews@gmail.com> | 2022-01-13 21:55:21 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-13 21:55:21 +1300 |
| commit | 69962fefc233ba06450b353073a2db4a9fce3ceb (patch) | |
| tree | 1c2fdc07d6172fc9f9d33c3d6615740bb6ad92c4 /.github | |
| parent | 0e26f598ef4b4930dcf3344cf6a430c984e62385 (diff) | |
| download | PROJ-69962fefc233ba06450b353073a2db4a9fce3ceb.tar.gz PROJ-69962fefc233ba06450b353073a2db4a9fce3ceb.zip | |
Specify CMAKE_INSTALL_RPATH for macOS; use -rpath LDFLAGS for tests (#3009)
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/doc_build.yml | 1 | ||||
| -rwxr-xr-x | .github/workflows/mac/before_install.sh | 10 |
2 files changed, 4 insertions, 7 deletions
diff --git a/.github/workflows/doc_build.yml b/.github/workflows/doc_build.yml index 2a3f4257..022da61a 100644 --- a/.github/workflows/doc_build.yml +++ b/.github/workflows/doc_build.yml @@ -37,7 +37,6 @@ jobs: working-directory: ./docs/plot run: | export PATH=/opt/proj/bin:$PATH - export LD_LIBRARY_PATH=/opt/proj/lib export PROJ_LIB=/opt/proj/share/proj ./plot.py plotdefs.json images/ diff --git a/.github/workflows/mac/before_install.sh b/.github/workflows/mac/before_install.sh index 217039fe..b01645ab 100755 --- a/.github/workflows/mac/before_install.sh +++ b/.github/workflows/mac/before_install.sh @@ -3,11 +3,9 @@ set -e -conda update -n base -c defaults conda -conda install compilers -y +conda update --yes --quiet -n base -c defaults conda +conda install --yes --quiet compilers conda config --set channel_priority strict -conda install --yes --quiet python=3.8 autoconf automake libtool ccache -y -conda install --yes --quiet proj=7.1.1=h45baca5_3 --only-deps -y - -./travis/before_install_pip.sh +conda install --yes --quiet python=3.8 autoconf automake libtool ccache jsonschema +conda install --yes --quiet --only-deps proj=7.1.1=h45baca5_3 |