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

deploy_target change PLUGINS destination

Browse Source
This commit is contained in:
Пелипенко Иван
2021-04-18 16:58:23 +03:00
parent 0877ab6f43
commit 61e3bb31f3
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
DeployMacros.cmake
View File

@@ -106,12 +106,12 @@ DESTINATION - dir where macro place package
RESOURCES, PLUGINS and FILES - list of directories and files, copied to: RESOURCES, PLUGINS and FILES - list of directories and files, copied to:
| | Windows | Linux | Linux (DEB_USR_DIR) | MacOS | | | Windows | Linux | Linux (DEB_USR_DIR) | MacOS |
|-----------|---------|-------------------------|---------------------------|---------------------| |-----------|---------|-----------------------------|---------------------------|---------------------|
| RESOURCES | root | /opt/COMPANY/target | /usr/share/COMPANY/target | Contents/Resources | | RESOURCES | root | /opt/COMPANY/target | /usr/share/COMPANY/target | Contents/Resources |
| PLUGINS | root | /opt/COMPANY/target | /usr/lib/COMPANY/target | Contents/PlugIns | | PLUGINS | root | /opt/COMPANY/target/plugins | /usr/lib/COMPANY/target | Contents/PlugIns |
| FILES | root | /opt/COMPANY/target | /usr/bin | Contents/MacOS | | FILES | root | /opt/COMPANY/target | /usr/bin | Contents/MacOS |
| LIBS | root | /opt/COMPANY/target/lib | /usr/lib | Contents/Frameworks | | LIBS | root | /opt/COMPANY/target/lib | /usr/lib | Contents/Frameworks |
Relative paths are taken from DEPLOY_DIR Relative paths are taken from DEPLOY_DIR
Also check library dependencies from PLUGINS and FILES Also check library dependencies from PLUGINS and FILES
@@ -704,7 +704,7 @@ macro(deploy_target _T)
if(_DEB_OPT) if(_DEB_OPT)
set(_bin_path "${_AGD}/opt/${${_T}_COMPANY}/${_T}") set(_bin_path "${_AGD}/opt/${${_T}_COMPANY}/${_T}")
set(_lib_path "${_AGD}/opt/${${_T}_COMPANY}/${_T}/lib") set(_lib_path "${_AGD}/opt/${${_T}_COMPANY}/${_T}/lib")
set(_pli_path "${_AGD}/opt/${${_T}_COMPANY}/${_T}") set(_pli_path "${_AGD}/opt/${${_T}_COMPANY}/${_T}/plugins")
set(_res_path "${_AGD}/opt/${${_T}_COMPANY}/${_T}") set(_res_path "${_AGD}/opt/${${_T}_COMPANY}/${_T}")
set(_ico_path "${_AGD}/opt/${${_T}_COMPANY}/${_T}/pixmaps") set(_ico_path "${_AGD}/opt/${${_T}_COMPANY}/${_T}/pixmaps")
set(_app_bin_path "/opt/${${_T}_COMPANY}/${_T}") set(_app_bin_path "/opt/${${_T}_COMPANY}/${_T}")
@@ -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 --qt-conf-dir "${_bin_path}") list(APPEND _dt_opts --qt-conf-dir "${_bin_path}" --qt-plugins-dir "${_pli_path}")
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}\"")