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 /travis | |
| 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 'travis')
| -rwxr-xr-x | travis/install.sh | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/travis/install.sh b/travis/install.sh index 89c03c4e..d38436e7 100755 --- a/travis/install.sh +++ b/travis/install.sh @@ -169,17 +169,17 @@ if [ "$BUILD_NAME" != "linux_gcc8" -a "$BUILD_NAME" != "linux_gcc_32bit" ]; then $TRAVIS_BUILD_DIR/test/postinstall/test_cmake.sh /tmp/proj_cmake_install shared $TRAVIS_BUILD_DIR/test/postinstall/test_autotools.sh /tmp/proj_cmake_install shared else - echo "Skipping test_autotools.sh test for $BUILD_NAME" + echo "Skipping test_cmake.sh and test_autotools.sh for $BUILD_NAME" fi cd .. - if [ $TRAVIS_OS_NAME != "osx" ]; then - # Check that we can retrieve the resource directory in a relative way after renaming the installation prefix - mkdir /tmp/proj_cmake_install_renamed - mv /tmp/proj_cmake_install /tmp/proj_cmake_install_renamed/subdir - /tmp/proj_cmake_install_renamed/subdir/bin/projsync --source-id ? --dry-run --system-directory || /bin/true - /tmp/proj_cmake_install_renamed/subdir/bin/projsync --source-id ? --dry-run --system-directory 2>/dev/null | grep "Downloading from https://cdn.proj.org into /tmp/proj_cmake_install_renamed/subdir/share/proj" - fi + # Check that we can retrieve the resource directory in a relative way after renaming the installation prefix + mkdir /tmp/proj_cmake_install_renamed + mv /tmp/proj_cmake_install /tmp/proj_cmake_install_renamed/subdir + set +e + /tmp/proj_cmake_install_renamed/subdir/bin/projsync --source-id ? --dry-run --system-directory + /tmp/proj_cmake_install_renamed/subdir/bin/projsync --source-id ? --dry-run --system-directory 2>/dev/null | grep "Downloading from https://cdn.proj.org into /tmp/proj_cmake_install_renamed/subdir/share/proj" + set -e # return to root cd ../.. |