diff --git a/SuperBuild/CMakeLists.txt b/SuperBuild/CMakeLists.txt index 0db9755f..0a95da39 100644 --- a/SuperBuild/CMakeLists.txt +++ b/SuperBuild/CMakeLists.txt @@ -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 diff --git a/SuperBuild/cmake/External-Entwine.cmake b/SuperBuild/cmake/External-Entwine.cmake index dfc057f2..cc8f4ab2 100644 --- a/SuperBuild/cmake/External-Entwine.cmake +++ b/SuperBuild/cmake/External-Entwine.cmake @@ -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() \ No newline at end of file +) \ No newline at end of file diff --git a/SuperBuild/cmake/External-OpenCV.cmake b/SuperBuild/cmake/External-OpenCV.cmake index 29340bbb..60cb0fa3 100644 --- a/SuperBuild/cmake/External-OpenCV.cmake +++ b/SuperBuild/cmake/External-OpenCV.cmake @@ -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() \ No newline at end of file +) \ No newline at end of file diff --git a/SuperBuild/cmake/External-OpenMVS.cmake b/SuperBuild/cmake/External-OpenMVS.cmake index 129ac35a..7f2c6e3b 100644 --- a/SuperBuild/cmake/External-OpenMVS.cmake +++ b/SuperBuild/cmake/External-OpenMVS.cmake @@ -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() \ No newline at end of file diff --git a/run.sh b/run.sh index a743b6de..34a6a4ab 100755 --- a/run.sh +++ b/run.sh @@ -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 "$@"