Ticket #56806: patch-inkscape_base_rpath.2.diff

File patch-inkscape_base_rpath.2.diff, 1.1 KB (added by RJVB (René Bertin), 6 years ago)
  • CMakeLists.txt

    diff --git CMakeLists.txt CMakeLists.txt
    index cddbfbe..9a2fa73 100644
    set(CMAKE_INCLUDE_CURRENT_DIR TRUE) 
    4242
    4343if(APPLE)
    4444    SET(CMAKE_MACOSX_RPATH TRUE)
    45     SET(CMAKE_INSTALL_RPATH "@loader_path/../lib/inkscape")
     45    # amend the rpath
     46    SET(CMAKE_INSTALL_RPATH "@loader_path/../lib/inkscape;${CMAKE_INSTALL_RPATH}")
     47    # make sure shared libraries will store full paths in their ID
     48    SET(CMAKE_BUILD_WITH_INSTALL_NAME_DIR TRUE)
    4649else()
    4750    SET(CMAKE_INSTALL_RPATH "$ORIGIN/../lib/inkscape")
    4851endif()
  • src/CMakeLists.txt

    diff --git src/CMakeLists.txt src/CMakeLists.txt
    index 9ee4491..c020deb 100644
    endif() 
    526526
    527527# Build everything except main and inkview.c in a shared library.
    528528add_library(inkscape_base SHARED ${inkscape_SRC} ${sp_SRC})
     529# use the "magic" path specifier for this library's ID (Mac specific)
     530set_target_properties(inkscape_base PROPERTIES
     531    INSTALL_NAME_DIR @rpath)
    529532
    530533# make executables for inkscape and inkview
    531534add_executable(inkscape ${main_SRC})