Use DYLD instead of fixing rpath

pull/1530/head
Piero Toffanin 2022-09-10 15:25:37 -04:00
rodzic 278e85db6a
commit 03e224691b
5 zmienionych plików z 3 dodań i 28 usunięć

Wyświetl plik

@ -36,15 +36,6 @@ if (APPLE)
if (NOT APPLE_CMAKE_ARGS)
message(WARNING "Cannot find Homebrew's compiler, compilation might fail...")
endif()
set(INSTALL_NAME_TOOL "${SB_ROOT_DIR}/scripts/macos_fix_rpath.sh")
macro(macos_fix_rpath project library)
add_custom_command(
TARGET ${project} POST_BUILD
COMMAND ${INSTALL_NAME_TOOL} "SuperBuild/install/lib" ${library}
COMMENT "Fixing rpath for ${library}"
)
endmacro()
endif()
################################
@ -245,9 +236,6 @@ externalproject_add(odm_orthophoto
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${SB_INSTALL_DIR}
${WIN32_CMAKE_ARGS} ${WIN32_GDAL_ARGS}
)
if(APPLE)
macos_fix_rpath(odm_orthophoto "${SB_INSTALL_DIR}/bin/odm_orthophoto")
endif()
externalproject_add(lastools
GIT_REPOSITORY https://github.com/OpenDroneMap/LAStools.git

Wyświetl plik

@ -33,8 +33,4 @@ ExternalProject_Add(${_proj_name}
LOG_DOWNLOAD OFF
LOG_CONFIGURE OFF
LOG_BUILD OFF
)
if (APPLE)
macos_fix_rpath(${_proj_name} "${SB_INSTALL_DIR}/bin/entwine")
endif()
)

Wyświetl plik

@ -89,8 +89,4 @@ ExternalProject_Add(${_proj_name}
LOG_DOWNLOAD OFF
LOG_CONFIGURE OFF
LOG_BUILD OFF
)
if (APPLE)
macos_fix_rpath(${_proj_name} "${SB_INSTALL_DIR}/lib/python3.8/dist-packages/cv2/python-3.8/cv2.cpython-38-darwin.so")
endif()
)

Wyświetl plik

@ -77,9 +77,3 @@ ExternalProject_Add(${_proj_name}
LOG_CONFIGURE OFF
LOG_BUILD OFF
)
if(APPLE)
macos_fix_rpath(${_proj_name} "${SB_INSTALL_DIR}/bin/OpenMVS/DensifyPointCloud")
macos_fix_rpath(${_proj_name} "${SB_INSTALL_DIR}/bin/OpenMVS/ReconstructMesh")
endif()

1
run.sh
Wyświetl plik

@ -2,5 +2,6 @@
RUNPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$RUNPATH/SuperBuild/install/lib
export DYLD_LIBRARY_PATH=$LD_LIBRARY_PATH:$RUNPATH/SuperBuild/install/lib
python3 $RUNPATH/run.py "$@"