From 681969c88ab48fb76f1e5d09c04f2488638da7d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?= =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= Date: Wed, 18 Mar 2020 20:28:34 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@848 a8b55f48-bf90-11e4-a774-851b48703e85 --- deploy_tool/main.cpp | 2 +- qad/QADDeploy.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy_tool/main.cpp b/deploy_tool/main.cpp index e311246..dbfd309 100644 --- a/deploy_tool/main.cpp +++ b/deploy_tool/main.cpp @@ -86,7 +86,7 @@ void procLdd(PIString file, bool ext_lib = false, int cur_depth = 0) { checked_libs << file; ++cur_depth; if (cur_depth > depth) return; - piCout << "scan" << file << "..." << cur_depth; + piCout << "scan" << file << "..." << cur_depth << checked_libs; PISet cur_libs; if (ext_lib) { if (!all_libs[file]) { diff --git a/qad/QADDeploy.cmake b/qad/QADDeploy.cmake index 891354d..7b2ceb1 100644 --- a/qad/QADDeploy.cmake +++ b/qad/QADDeploy.cmake @@ -220,7 +220,7 @@ macro(deploy_target _T) COMMAND echo \"Replaces:\" ${_echo} COMMAND echo \"Section: misc\" ${_echo} COMMAND echo \"Priority: optional\" ${_echo} - COMMAND echo \"Description: ${${_T}_INFO}\" + COMMAND echo \"Description: ${${_T}_INFO}\" ${_echo} #COMMAND deploy_tool -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}