diff --git a/qad/QADDeploy.cmake b/qad/QADDeploy.cmake index 115e716..7245613 100644 --- a/qad/QADDeploy.cmake +++ b/qad/QADDeploy.cmake @@ -167,9 +167,9 @@ macro(deploy_target _T) get_target_property(_II ${_L} IMPORTED) if (NOT _II) #message("depend on ${_L}") - set(_DEP_LIBPATH "${_DEP_LIBPATH};$") get_target_property(_LT ${_L} TYPE) if ("x${_LT}" STREQUAL "xSHARED_LIBRARY") + set(_DEP_LIBPATH "${_DEP_LIBPATH};$") set(_DEP_LIBS_CS "${_DEP_LIBS_CS};$/$") set(_DEP_LIBS "${_DEP_LIBS}" "$/$") endif() @@ -200,8 +200,10 @@ macro(deploy_target _T) endif() set(_DEB "${_TV}_deb_${_DEB_ARCH}") set(_AGD "${_DEPLOY_DIR}/${_DEB}") - set(_echof ">" "${_AGD}/DEBIAN/control") - set(_echo ">>" "${_AGD}/DEBIAN/control") + set(_C_echof ">" "${_AGD}/DEBIAN/control") + set(_C_echo ">>" "${_AGD}/DEBIAN/control") + set(_D_echof ">" "${_AGD}/usr/share/applications/${_DEBNAME}.desktop") + set(_D_echo ">>" "${_AGD}/usr/share/applications/${_DEBNAME}.desktop") add_custom_target(deploy # gather deb dir COMMAND mkdir -p ${_AGD}/DEBIAN @@ -214,19 +216,34 @@ macro(deploy_target _T) COMMAND cp -f ${_DEP_LIBS} ${_AGD}/usr/lib COMMAND cp -r ${_DEPLOY_DIR}/lang ${_AGD}/usr/share/SHS COMMAND cp -f ${_ICON_FN} ${_AGD}/usr/share/pixmaps - COMMAND echo "Package: ${_DEBNAME}" ${_echof} - COMMAND echo "Version: ${${_T}_VERSION}" ${_echo} - COMMAND echo "Architecture: ${_DEB_ARCH}" ${_echo} - COMMAND echo "Maintainer: ${${_T}_COMPANY} <>" ${_echo} - COMMAND deploy_tool --prefix "Depends: " --dependencies -l ${CMAKE_LDD} ${_DEPLOY_DIR}/${_T} -a "${_DEP_LIBS_CS}" -o "${_AGD}/usr/lib" ${_echo} - COMMAND echo "Conflicts:" ${_echo} - COMMAND echo "Replaces:" ${_echo} - COMMAND echo "Section: misc" ${_echo} - COMMAND echo "Priority: optional" ${_echo} - COMMAND echo "Description: ${${_T}_INFO}" ${_echo} + + COMMAND echo "Package: ${_DEBNAME}" ${_C_echof} + COMMAND echo "Version: ${${_T}_VERSION}" ${_C_echo} + COMMAND echo "Architecture: ${_DEB_ARCH}" ${_C_echo} + COMMAND echo "Maintainer: ${${_T}_COMPANY} <>" ${_C_echo} + COMMAND deploy_tool --prefix "Depends: " --dependencies -l ${CMAKE_LDD} ${_DEPLOY_DIR}/${_T} -a "${_DEP_LIBS_CS}" -o "${_AGD}/usr/lib" ${_C_echo} + COMMAND echo "Conflicts:" ${_C_echo} + COMMAND echo "Replaces:" ${_C_echo} + COMMAND echo "Section: misc" ${_C_echo} + COMMAND echo "Priority: optional" ${_C_echo} + COMMAND echo "Description: ${${_T}_INFO}" ${_C_echo} + + COMMAND echo "[Desktop Entry]" ${_D_echof} + COMMAND echo "Encoding=UTF-8" ${_D_echo} + COMMAND echo "Type=Application" ${_D_echo} + COMMAND echo "Name=${${_T}_LABEL}" ${_D_echo} + COMMAND echo "GenericName=${${_T}_LABEL}" ${_D_echo} + COMMAND echo "Comment=${${_T}_INFO}" ${_D_echo} + COMMAND echo "Exec=/usr/bin/${_T}" ${_D_echo} + COMMAND echo "Icon=${_ICON_FN}" ${_D_echo} + COMMAND echo "Terminal=false" ${_D_echo} + COMMAND echo "StartupNotify=true" ${_D_echo} + #COMMAND echo "X-KDE-StartupNotify=true" ${_D_echo} + COMMAND echo "Categories=Utility;" ${_D_echo} + #COMMAND -l "${CMAKE_LDD}" -P xcb -q ${Qt5_ROOT} -s "\"${CMAKE_PREFIX_PATH}/lib;${DEPLOY_ADD_LIBPATH}${_DEP_LIBPATH}\"" -o ${_AGD}/usr/lib -p ${_AGD}/usr/ ${_AGD}/Contents/MacOS/${_T} # generate deb - #COMMAND genisoimage -quiet -V ${_T} -D -R -apple -no-pad -o ${_DESTINATION}/${_TV}.dmg ${_DMG} + COMMAND dpkg-deb -b ${_AGD} ${_DESTINATION}/${_TV}_${_DEB_ARCH}.deb VERBATIM COMMENT "Generating ${_TV}.deb" )