kopia lustrzana https://github.com/OpenDroneMap/ODM
Use DYLD instead of fixing rpath
rodzic
278e85db6a
commit
03e224691b
|
@ -36,15 +36,6 @@ if (APPLE)
|
||||||
if (NOT APPLE_CMAKE_ARGS)
|
if (NOT APPLE_CMAKE_ARGS)
|
||||||
message(WARNING "Cannot find Homebrew's compiler, compilation might fail...")
|
message(WARNING "Cannot find Homebrew's compiler, compilation might fail...")
|
||||||
endif()
|
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()
|
endif()
|
||||||
|
|
||||||
################################
|
################################
|
||||||
|
@ -245,9 +236,6 @@ externalproject_add(odm_orthophoto
|
||||||
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${SB_INSTALL_DIR}
|
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${SB_INSTALL_DIR}
|
||||||
${WIN32_CMAKE_ARGS} ${WIN32_GDAL_ARGS}
|
${WIN32_CMAKE_ARGS} ${WIN32_GDAL_ARGS}
|
||||||
)
|
)
|
||||||
if(APPLE)
|
|
||||||
macos_fix_rpath(odm_orthophoto "${SB_INSTALL_DIR}/bin/odm_orthophoto")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
externalproject_add(lastools
|
externalproject_add(lastools
|
||||||
GIT_REPOSITORY https://github.com/OpenDroneMap/LAStools.git
|
GIT_REPOSITORY https://github.com/OpenDroneMap/LAStools.git
|
||||||
|
|
|
@ -33,8 +33,4 @@ ExternalProject_Add(${_proj_name}
|
||||||
LOG_DOWNLOAD OFF
|
LOG_DOWNLOAD OFF
|
||||||
LOG_CONFIGURE OFF
|
LOG_CONFIGURE OFF
|
||||||
LOG_BUILD OFF
|
LOG_BUILD OFF
|
||||||
)
|
)
|
||||||
|
|
||||||
if (APPLE)
|
|
||||||
macos_fix_rpath(${_proj_name} "${SB_INSTALL_DIR}/bin/entwine")
|
|
||||||
endif()
|
|
|
@ -89,8 +89,4 @@ ExternalProject_Add(${_proj_name}
|
||||||
LOG_DOWNLOAD OFF
|
LOG_DOWNLOAD OFF
|
||||||
LOG_CONFIGURE OFF
|
LOG_CONFIGURE OFF
|
||||||
LOG_BUILD 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()
|
|
|
@ -77,9 +77,3 @@ ExternalProject_Add(${_proj_name}
|
||||||
LOG_CONFIGURE OFF
|
LOG_CONFIGURE OFF
|
||||||
LOG_BUILD 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
1
run.sh
|
@ -2,5 +2,6 @@
|
||||||
|
|
||||||
RUNPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
RUNPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||||
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$RUNPATH/SuperBuild/install/lib
|
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 "$@"
|
python3 $RUNPATH/run.py "$@"
|
||||||
|
|
||||||
|
|
Ładowanie…
Reference in New Issue