diff --git a/DeployMacros.cmake b/DeployMacros.cmake index 7206c1f..1dcbe7d 100644 --- a/DeployMacros.cmake +++ b/DeployMacros.cmake @@ -106,12 +106,12 @@ DESTINATION - dir where macro place package RESOURCES, PLUGINS and FILES - list of directories and files, copied to: -| | Windows | Linux | Linux (DEB_USR_DIR) | MacOS | -|-----------|---------|-------------------------|---------------------------|---------------------| -| RESOURCES | root | /opt/COMPANY/target | /usr/share/COMPANY/target | Contents/Resources | -| PLUGINS | root | /opt/COMPANY/target | /usr/lib/COMPANY/target | Contents/PlugIns | -| FILES | root | /opt/COMPANY/target | /usr/bin | Contents/MacOS | -| LIBS | root | /opt/COMPANY/target/lib | /usr/lib | Contents/Frameworks | +| | Windows | Linux | Linux (DEB_USR_DIR) | MacOS | +|-----------|---------|-----------------------------|---------------------------|---------------------| +| RESOURCES | root | /opt/COMPANY/target | /usr/share/COMPANY/target | Contents/Resources | +| PLUGINS | root | /opt/COMPANY/target/plugins | /usr/lib/COMPANY/target | Contents/PlugIns | +| FILES | root | /opt/COMPANY/target | /usr/bin | Contents/MacOS | +| LIBS | root | /opt/COMPANY/target/lib | /usr/lib | Contents/Frameworks | Relative paths are taken from DEPLOY_DIR Also check library dependencies from PLUGINS and FILES @@ -704,7 +704,7 @@ macro(deploy_target _T) if(_DEB_OPT) set(_bin_path "${_AGD}/opt/${${_T}_COMPANY}/${_T}") 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(_ico_path "${_AGD}/opt/${${_T}_COMPANY}/${_T}/pixmaps") set(_app_bin_path "/opt/${${_T}_COMPANY}/${_T}") @@ -754,7 +754,7 @@ macro(deploy_target _T) endif() set(_dt_opts -L "${CMAKE_READELF}" --dpkg-workdir "${CMAKE_DPKG_WORKDIR}" -s "${_dt_searchdirs}") 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") #message("VER = \"${_DEBVERSION}\"") #message("DEB = \"${_deb_name}\"")