Commit 6d4e3c59 authored by Arnaud Billon's avatar Arnaud Billon
Browse files

Merge branch 'fix/sb-improvements' into 'master'

[fix] Instruct OSX to bundle LidarSLam.dylib

See merge request !22
parents b9c977b8 74dfe417
......@@ -133,7 +133,7 @@ endif()
set(ENABLE_python3 True CACHE BOOL INTERNAL)
if(UNIX)
# The following variable is used to define if python libs have to be used from the system
# The following variable is used to define if python libs have to be used from the system
# directory (USE_SYSTEM_python3=True) or shipped in install dir (USE_SYSTEM_python3=False)
# this behavior is managed by the superbuild python install functions
if(NOT DEFINED USE_SYSTEM_python3)
......@@ -151,7 +151,7 @@ if(UNIX)
set(PYTHON_INCLUDE_DIRS ${Python3_INCLUDE_DIRS})
set(PYTHON_INCLUDE_DIR ${Python3_INCLUDE_DIRS})
set(PYTHON_LIBRARY ${Python3_LIBRARIES})
# Python3_INCLUDE_DIR and Python3_LIBRARY are Artefacts in FindPython3
# Both can be used to specific a python version
# (See cmake FindPython3 documentations)
......@@ -184,12 +184,13 @@ function (superbuild_add_packaging)
endif ()
list(APPEND superbuild_export_variables
qt5_version)
# pass some variables that are required for packaging step:
list(APPEND superbuild_export_variables
PARAVIEW_VERSION
package_suffix
ENABLE_slam
)
set(default_package lidarview)
......@@ -272,4 +273,4 @@ if (NOT ${USE_SYSTEM_boost} AND (DEFINED ENV{BOOSTROOT} OR DEFINED ENV{BOOST_ROO
message(WARNING "Some Boost environment variables are set and may hide the local superbuild Boost installation. "
"Consider enabling USE_SYSTEM_boost flag or unsetting the following environement variables :\n"
" BOOSTROOT=$ENV{BOOSTROOT}\n BOOST_ROOT=$ENV{BOOST_ROOT}\n BOOST_LIBRARYDIR=$ENV{BOOST_LIBRARYDIR}\n BOOST_INCLUDEDIR=$ENV{BOOST_INCLUDEDIR}")
endif()
\ No newline at end of file
endif()
......@@ -7,6 +7,8 @@
# here https://gitlab.kitware.com/cmake/cmake/-/issues/19315).
# This script change paths for all boost dependencies from libboost_* to @rpath/libboost_*
message(WARNING "Applying Reset rpath for all boost dependencies path")
get_filename_component(install_location "${CMAKE_INSTALL_PREFIX}" ABSOLUTE)
# get a list of all boost lib used
file(GLOB boost_libs LIST_DIRECTORIES false "${install_location}/lib/libboost*.dylib")
......@@ -18,25 +20,13 @@ file(GLOB test_list LIST_DIRECTORIES false "bin/Test*")
foreach (boost_lib IN LISTS boost_libs)
get_filename_component(libboost_name "${boost_lib}" NAME)
foreach (app_name IN LISTS app_list)
MESSAGE("Setting RPATH for ${boost_lib}")
foreach (bin_name IN LISTS app_list lib_list test_list)
MESSAGE(" Set on bin ${bin_name}")
execute_process(
COMMAND install_name_tool
-change "${libboost_name}" "@rpath/${libboost_name}"
"${app_name}")
"${bin_name}")
endforeach ()
foreach (lib_name IN LISTS lib_list)
execute_process(
COMMAND install_name_tool
-change "${libboost_name}" "@rpath/${libboost_name}"
"${lib_name}")
endforeach ()
foreach (test_name IN LISTS test_list)
execute_process(
COMMAND install_name_tool
-change "${libboost_name}" "@rpath/${libboost_name}"
"${test_name}")
endforeach ()
endforeach ()
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