Commit e30758f5 authored by Ben Boeckel's avatar Ben Boeckel
Browse files

las: don't force @rpath usage on macOS

parent 1ed528dc
......@@ -30,6 +30,9 @@ superbuild_apply_patch(las add-boost-include-dirs
superbuild_apply_patch(las allow-rpath
"Don't reject RPATH settings on Linux")
superbuild_apply_patch(las no-force-rpath
"Don't force @rpath usage on macOS")
# https://github.com/libLAS/libLAS/pull/174
superbuild_apply_patch(las boost-find-package
"Find Boost during find_package(liblas) for 1.70 support")
......
diff -u -Nru5 libLAS-1.8.1/src/CMakeLists.txt libLAS-1.8.1.no-force-rpath/src/CMakeLists.txt
--- libLAS-1.8.1/src/CMakeLists.txt 2016-08-23 12:44:16.000000000 -0400
+++ libLAS-1.8.1.no-force-rpath/src/CMakeLists.txt 2021-04-02 10:47:17.711920434 -0400
@@ -238,11 +238,11 @@
set_target_properties(${LIBLAS_C_LIB_NAME}
PROPERTIES
VERSION "${LIBLAS_C_LIB_VERSION}"
SOVERSION "${LIBLAS_C_LIB_SOVERSION}")
-if (APPLE)
+if (APPLE AND NOT CMAKE_INSTALL_NAME_DIR)
set_target_properties(
${LIBLAS_C_LIB_NAME}
PROPERTIES
INSTALL_NAME_DIR "@rpath" BUILD_WITH_INSTALL_RPATH ON)
set_target_properties(
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment