SHS/cmake
4
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

deploy_tool rpath

Browse Source
This commit is contained in:
Пелипенко Иван
2021-04-21 17:12:03 +03:00
parent 148cf34098
commit dff300ca10
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
DeployMacros.cmake
View File

@@ -754,7 +754,7 @@ macro(deploy_target _T)
endif() endif()
set(_dt_opts -L "${CMAKE_READELF}" --dpkg-workdir "${CMAKE_DPKG_WORKDIR}" -s "${_dt_searchdirs}") set(_dt_opts -L "${CMAKE_READELF}" --dpkg-workdir "${CMAKE_DPKG_WORKDIR}" -s "${_dt_searchdirs}")
endif() endif()
list(APPEND _dt_opts -q "${Qt5_ROOT}" --qt-conf-dir "${_bin_path}" --qt-plugins-dir "${_pli_path}" --rpath "\\$ORIGIN:\\$ORIGIN/lib") list(APPEND _dt_opts -q "${Qt5_ROOT}" --qt-conf-dir "${_bin_path}" --qt-plugins-dir "${_pli_path}" --rpath)
set(_deb_name "${_TV}_${_TARGET_OS}_${_DEB_ARCH}.deb") set(_deb_name "${_TV}_${_TARGET_OS}_${_DEB_ARCH}.deb")
#message("VER = \"${_DEBVERSION}\"") #message("VER = \"${_DEBVERSION}\"")
#message("DEB = \"${_deb_name}\"") #message("DEB = \"${_deb_name}\"")
@@ -762,7 +762,7 @@ macro(deploy_target _T)
list(APPEND _CMD_ COMMAND echo "Version: ${_DEBVERSION}" ${_C_echo}) list(APPEND _CMD_ COMMAND echo "Version: ${_DEBVERSION}" ${_C_echo})
list(APPEND _CMD_ COMMAND echo "Architecture: ${_DEB_ARCH}" ${_C_echo}) list(APPEND _CMD_ COMMAND echo "Architecture: ${_DEB_ARCH}" ${_C_echo})
list(APPEND _CMD_ COMMAND echo "Maintainer: ${${_T}_COMPANY} <>" ${_C_echo}) list(APPEND _CMD_ COMMAND echo "Maintainer: ${${_T}_COMPANY} <>" ${_C_echo})
list(APPEND _CMD_ COMMAND ${PIP_DEPLOY_TOOL} ${_OPTIONS} --prefix "Depends: " --dependencies ${_dt_opts} -a "${_DEP_LIBS_CS}" -o "${_lib_path}" ${_DEPLOY_DIR}/$<TARGET_FILE_NAME:${_T}> ${_ADD_DEPS} ${_C_echo}) list(APPEND _CMD_ COMMAND ${PIP_DEPLOY_TOOL} ${_OPTIONS} --prefix "Depends: " --dependencies ${_dt_opts} -a "${_DEP_LIBS_CS}" -o "${_lib_path}" ${_bin_path}/$<TARGET_FILE_NAME:${_T}> ${_ADD_DEPS} ${_C_echo})
list(APPEND _CMD_ COMMAND echo "Conflicts:" ${_C_echo}) list(APPEND _CMD_ COMMAND echo "Conflicts:" ${_C_echo})
list(APPEND _CMD_ COMMAND echo "Replaces:" ${_C_echo}) list(APPEND _CMD_ COMMAND echo "Replaces:" ${_C_echo})
list(APPEND _CMD_ COMMAND echo "Section: misc" ${_C_echo}) list(APPEND _CMD_ COMMAND echo "Section: misc" ${_C_echo})