git-svn-id: svn://db.shs.com.ru/libs@858 a8b55f48-bf90-11e4-a774-851b48703e85

This commit is contained in:
2020-03-18 21:18:57 +00:00
parent 08995b9c5d
commit c3dd466f47

View File

@@ -159,6 +159,7 @@ macro(deploy_target _T)
get_filename_component(_ICON_FN "${${_T}_ICON}" ABSOLUTE BASE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
set(_TV "${_T}_${${_T}_VERSION}")
set(_DEP_LIBPATH)
set(_DEP_LIBS_CS)
set(_DEP_LIBS)
get_target_property(_LL ${_T} LINK_LIBRARIES)
foreach (_L ${_LL})
@@ -169,6 +170,7 @@ macro(deploy_target _T)
set(_DEP_LIBPATH "${_DEP_LIBPATH};$<TARGET_FILE_DIR:${_L}>")
get_target_property(_LT ${_L} TYPE)
if ("x${_LT}" STREQUAL "xSHARED_LIBRARY")
set(_DEP_LIBS_CS "${_DEP_LIBS_CS};$<TARGET_FILE_DIR:${_L}>/$<TARGET_FILE_NAME:${_L}>")
set(_DEP_LIBS "${_DEP_LIBS}" "$<TARGET_FILE_DIR:${_L}>/$<TARGET_FILE_NAME:${_L}>")
endif()
endif()
@@ -215,7 +217,7 @@ macro(deploy_target _T)
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} ${_echo}
COMMAND deploy_tool --prefix "Depends: " --dependencies -l ${CMAKE_LDD} ${_DEPLOY_DIR}/${_T} -a "${_DEP_LIBS_CS}" ${_echo}
COMMAND echo "Conflicts:" ${_echo}
COMMAND echo "Replaces:" ${_echo}
COMMAND echo "Section: misc" ${_echo}