From fc5f12cebc5968f580a62ba237fa7bbf721e75a1 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: Sat, 14 Mar 2020 19:36:18 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@782 a8b55f48-bf90-11e4-a774-851b48703e85 --- deploy_tool/main.cpp | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/deploy_tool/main.cpp b/deploy_tool/main.cpp index 5896dc5..905cfb1 100644 --- a/deploy_tool/main.cpp +++ b/deploy_tool/main.cpp @@ -4,15 +4,17 @@ using namespace PICoutManipulators; -PIString cmd_copy; +PIString cmd_copy, cmd_copydir; PIString qplatforms; void setCommands() { #ifdef WINDOWS cmd_copy = "copy /y "; + cmd_copydir = "copy /y "; qplatforms = "windows"; #else cmd_copy = "cp -f "; + cmd_copydir = "cp -rf "; # ifdef MAC_OS qplatforms = "cocoa"; # else @@ -143,6 +145,8 @@ void procLdd(PIString file, bool ext_lib = false, int cur_depth = 0) { if (!otool.isEmpty()) { if (l.contains(".framework/")) { frameworks << l; + if (l.contains("QtCore") || l.contains("Qt5Core")) + need_qt = true; continue; } } @@ -339,6 +343,14 @@ int main(int argc, char * argv[]) { if (!fake) system(cmd_copy + "\"" + l + "\" \"" + out_dir + "\""); } + PIVector fwdirs = frameworks.toVector(); + piForeachC (PIString & f, fwdirs) { + PIString fd = findLib(f); + piCout << "copy framework" << f; + if (!fake) + system(cmd_copydir + "\"" + fd + "\" \"" + out_dir + "\""); + } + piCout << "copied" << clibs.size_s() << "files"; if (!miss_libs.isEmpty()) { piCout << "Missing libraries:\n - " << PIStringList(miss_libs.toVector()).join("\n - ");