From 4f591deced033aa112267173a0ffb58fcab16030 Mon Sep 17 00:00:00 2001
From: Shawn Hoffman <godisgovernment@gmail.com>
Date: Fri, 26 May 2023 15:22:11 -0700
Subject: [PATCH] fixups for cmake builds

---
 examples/dolphin-arm64.yml | 9 +++++++--
 examples/dolphin-x64.yml   | 9 +++++++--
 qsc/__main__.py            | 6 ------
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/examples/dolphin-arm64.yml b/examples/dolphin-arm64.yml
index 0df1106..05aa8ad 100644
--- a/examples/dolphin-arm64.yml
+++ b/examples/dolphin-arm64.yml
@@ -77,7 +77,6 @@ postprocess:
         - doc
         - include/QtXml
         - lib/cmake/Qt6Xml
-        - mkspecs
         - modules/Xml.json
     delete_regex:
         - .*\.prl
@@ -87,8 +86,14 @@ postprocess:
         - bin\\.*\.pl
         - bin\\android.*
         - bin\\Qt6Xml.*
-        - lib\\metatypes\\qt6xml_.*\.json
+        - lib\\cmake\\Qt6Gui\\Qt6QICNSPlugin.*\.cmake
+        - lib\\cmake\\Qt6Gui\\Qt6QMinimalIntegrationPlugin.*\.cmake
+        - lib\\cmake\\Qt6Gui\\Qt6QOffscreenIntegrationPlugin.*\.cmake
+        - lib\\cmake\\Qt6Gui\\Qt6QTgaPlugin.*\.cmake
+        - lib\\cmake\\Qt6Gui\\Qt6QWbmpPlugin.*\.cmake
         - lib\\Qt6Xml.*
+        - lib\\metatypes\\qt6xml_.*\.json
+        - mkspecs\\(?!win32-msvc).*
         - plugins\\imageformats\\qicns.*
         - plugins\\imageformats\\qtga.*
         - plugins\\imageformats\\qwbmp.*
diff --git a/examples/dolphin-x64.yml b/examples/dolphin-x64.yml
index d1f82d8..5486190 100644
--- a/examples/dolphin-x64.yml
+++ b/examples/dolphin-x64.yml
@@ -76,7 +76,6 @@ postprocess:
         - doc
         - include/QtXml
         - lib/cmake/Qt6Xml
-        - mkspecs
         - modules/Xml.json
     delete_regex:
         # needed if the outputs are to be used as cross compile host tools
@@ -86,8 +85,14 @@ postprocess:
         - bin\\.*\.cmake
         - bin\\.*\.pl
         - bin\\Qt6Xml.*
-        - lib\\metatypes\\qt6xml_.*\.json
+        - lib\\cmake\\Qt6Gui\\Qt6QICNSPlugin.*\.cmake
+        - lib\\cmake\\Qt6Gui\\Qt6QMinimalIntegrationPlugin.*\.cmake
+        - lib\\cmake\\Qt6Gui\\Qt6QOffscreenIntegrationPlugin.*\.cmake
+        - lib\\cmake\\Qt6Gui\\Qt6QTgaPlugin.*\.cmake
+        - lib\\cmake\\Qt6Gui\\Qt6QWbmpPlugin.*\.cmake
         - lib\\Qt6Xml.*
+        - lib\\metatypes\\qt6xml_.*\.json
+        - mkspecs\\(?!win32-msvc).*
         - plugins\\imageformats\\qicns.*
         - plugins\\imageformats\\qtga.*
         - plugins\\imageformats\\qwbmp.*
diff --git a/qsc/__main__.py b/qsc/__main__.py
index f17e2d0..4afa664 100644
--- a/qsc/__main__.py
+++ b/qsc/__main__.py
@@ -142,10 +142,4 @@ if __name__ == "__main__":
     # Post process output
     postprocess_dir(output_path, config.get("postprocess", {}))
 
-    # Bit of a hack: Qt cmake files rely on mkspec dirs being present
-    # even though the contents aren't really used. Ensure they exist.
-    # see lib\cmake\Qt6\QtBuild.cmake
-    if compiler.get("name") == "visual_studio":
-        os.makedirs(os.path.join(output_path, "mkspecs/win32-msvc"), exist_ok=True)
-
     print("Done. Result in {}".format(output_path))
\ No newline at end of file