mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-05-03 22:56:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix RPATH syntax for linux

Browse source
This commit is contained in:
Julien Wadel 2020-02-08 09:25:37 +01:00
parent 3fb54ecb3f
commit 77e51db886
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
CMakeLists.txt
View file

@ -23,14 +23,17 @@
cmake_minimum_required(VERSION 3.1)
project(linphoneqt VERSION 4.1.1)
# Prepare gobal CMAKE configuration specific to the current project
list(APPEND CMAKE_PREFIX_PATH "linphone-sdk/build-sdk/linphone-sdk/desktop")
list(APPEND CMAKE_PREFIX_PATH "submodules/externals/minizip/build-minizip/OUTPUT")
set(CMAKE_INSTALL_PREFIX "OUTPUT")
if(UNIX AND NOT APPLE)
set(CMAKE_INSTALL_RPATH "lib64;../lib64")
set(CMAKE_INSTALL_RPATH "$ORIGIN/lib64;$ORIGIN/../lib64;$ORIGIN/lib;$ORIGIN/../lib")
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
endif()
#------------------------------------------------------------------------------
set(APP_LIBRARY app-library)
include(application_info.cmake)
@ -42,6 +45,10 @@ set(CMAKE_CXX_STANDARD 11)
set(ASSETS_DIR "assets")
#-------------------------------------------------------------------------------
# SET OPTIONS
#-------------------------------------------------------------------------------
option(ENABLE_UPDATE_CHECK "Enable update check." NO)
option(ENABLE_GPL_THIRD_PARTIES "" YES)
@ -423,7 +430,6 @@ set_property(TARGET ${APP_LIBRARY} PROPERTY AUTORCC ON)
bc_git_version(${TARGET_NAME} ${PROJECT_VERSION})
add_dependencies(${APP_LIBRARY} ${TARGET_NAME}-git-version)
add_dependencies(${APP_LIBRARY} update_translations)
if (WIN32)
add_executable(${TARGET_NAME} WIN32 $<TARGET_OBJECTS:${APP_LIBRARY}> ${ASSETS_DIR}/app-icon.rc ${MAIN_FILE})
else ()
@ -554,7 +560,7 @@ install(SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/cmake_builder/install.cmake")
#endif ()
if(APPLE)
target_link_libraries(${TARGET_NAME} "${LINPHONE_SDK_TMP}/lib/libminizip.dylib")
target_link_libraries(${TARGET_NAME} "${LINPHONE_SDK_TMP}/lib/libminizip.dylib")
elseif(NOT WIN32)
if( EXISTS "${LINPHONE_SDK_TMP}/lib64/libminizip.so")
target_link_libraries(${TARGET_NAME} "${LINPHONE_SDK_TMP}/lib64/libminizip.so")

5
cmake_builder/linphone_package/CMakeLists.txt
View file

@ -255,8 +255,8 @@ else()# Not Windows and Apple
get_filename_component(LIBRARY_FILENAME ${LIBRARY} NAME)
#if(NOT ("${LIBRARY_FILENAME}" STREQUAL "libminizip.dylib"))
message("Changing RPATH of ${LIBRARY_FILENAME} from '${LINPHONE_OUTPUT_DIR}/lib' to '@executable_path/../lib'")
execute_process(COMMAND install_name_tool -rpath "${LINPHONE_OUTPUT_DIR}/lib" "@executable_path/../lib" "${LIBRARY}")
execute_process(COMMAND install_name_tool -rpath "${LINPHONE_OUTPUT_DIR}/lib" "@executable_path/../lib64" "${LIBRARY}")
execute_process(COMMAND install_name_tool -rpath "${LINPHONE_OUTPUT_DIR}/lib" "$ORIGIN/../lib" "${LIBRARY}")
execute_process(COMMAND install_name_tool -rpath "${LINPHONE_OUTPUT_DIR}/lib" "$ORIGIN/../lib64" "${LIBRARY}")
#endif()
endforeach ()
install(DIRECTORY "${LINPHONE_SDK_TMP}/bin/" DESTINATION "bin" USE_SOURCE_PERMISSIONS)
@ -282,7 +282,6 @@ else()# Not Windows and Apple
# install(FILES "${LINPHONE_OUTPUT_DIR}/share/${APPLICATION_NAME}/assistant/use-other-sip-account.rc" DESTINATION "share/${APPLICATION_NAME}/assistant")
# install(FILES "${LINPHONE_OUTPUT_DIR}/share/${APPLICATION_NAME}/assistant/create-app-sip-account.rc" DESTINATION "share/${APPLICATION_NAME}/assistant")
# install(FILES "${LINPHONE_OUTPUT_DIR}/share/${APPLICATION_NAME}/assistant/use-app-sip-account.rc" DESTINATION "share/${APPLICATION_NAME}/assistant")
endif ()
# Temporary deactivate