Skip to content

Commit 63010bf

Browse files
committed
fix
1 parent b031d7c commit 63010bf

File tree

1 file changed

+14
-5
lines changed

1 file changed

+14
-5
lines changed

src/tools/OpenCvSharp.ReleaseMaker/Packer.cs

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -143,18 +143,27 @@ private static void MakeBinaryPackage(string dir, string dirDst, string opencvVe
143143
{
144144
foreach (var arch in p.Value)
145145
{
146-
var externDir = Path.Combine(dirSrc, "Release");
146+
string externDir;
147147
if (p.Key == "uwp")
148-
externDir = Path.Combine(externDir, "uwpOpenCvSharpExtern");
149-
var pfExtern = (arch == "x86") ? "Win32" : "x64";
150-
externDir = Path.Combine(externDir, pfExtern);
148+
{
149+
var pfExtern = (arch == "x86") ? "Win32" : "x64";
150+
externDir = Path.Combine(dirSrc, "Release", "uwpOpenCvSharpExtern", pfExtern);
151+
}
152+
else
153+
{
154+
// cmake VS generator outputs to src/build/OpenCvSharpExtern/Release/
155+
externDir = Path.Combine(dirSrc, "build", "OpenCvSharpExtern", "Release");
156+
}
151157

152158
foreach (var ext in new[] { "dll", "pdb" })
153159
{
154160
var dstDirectory = Path.Combine("NativeLib", p.Key, arch);
161+
var srcFile = Path.Combine(externDir, $"OpenCvSharpExtern.{ext}");
162+
if (!File.Exists(srcFile))
163+
continue;
155164

156165
zipArchive.CreateEntryFromFile(
157-
Path.Combine(externDir, $"OpenCvSharpExtern.{ext}"),
166+
srcFile,
158167
Path.Combine(dstDirectory, $"OpenCvSharpExtern.{ext}"));
159168
}
160169

0 commit comments

Comments
 (0)