From 2a52a506b909e9a13a3b610a3e791e06e9b5a6ba Mon Sep 17 00:00:00 2001
From: Michael Hansen <zrax0111@gmail.com>
Date: Wed, 13 May 2020 15:26:52 -0700
Subject: [PATCH] Un-merge everything except Python, and remove CURL's cmake
 modules.

---
 appveyor.yml | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 992f2b0..6c69d91 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -21,27 +21,20 @@ build_script:
 
       vcpkg list --x-full-desc
 
-      # Merge debug output into root, where possible
+      # Merge debug output into root, where required
       Set-Location C:\tools\vcpkg\installed
-      $debugDirs = @(
-          "x86-windows-static-dyncrt\debug\lib",
-          "x86-windows\debug\bin",
-          "x86-windows\debug\lib"
-      )
-      ForEach ($dir in $debugDirs) {
-          $dest = $dir.replace("\debug\", "\")
-          Get-ChildItem $dir\*.* | ForEach-Object {
-              if (-not (Test-Path "$dest\$($_.Name)")) {
-                  Move-Item $_.FullName "$dest\$($_.Name)"
-              }
-          }
-      }
+      Move-Item "x86-windows\debug\bin\python27_d.*" "x86-windows\bin\"
+      Move-Item "x86-windows\debug\lib\python27_d.*" "x86-windows\lib\"
+
+      # CURL's cmake modules are incompatible with Plasma, but CMake 3.17 tries
+      # to use them anyway...  So we just nuke 'em
+      Remove-Item "x86-windows-static-dyncrt\share\curl\CURL*.cmake"
 
       Set-Location C:\tools\vcpkg\installed\x86-windows-static-dyncrt
       7z a $outpath\devlibs.zip debug\lib include lib misc share
       if ($lastExitCode -ne 0) { throw "Failed to archive static libs" }
       Set-Location C:\tools\vcpkg\installed\x86-windows
-      7z a $outpath\devlibs.zip debug\bin debug\lib bin include lib share
+      7z a $outpath\devlibs.zip bin include lib share
       if ($lastExitCode -ne 0) { throw "Failed to archive dynamic libs" }
 
 artifacts: