fixups for cmake builds

This commit is contained in:
Shawn Hoffman
2023-05-26 15:22:11 -07:00
parent 07f2b28c5d
commit 4f591deced
3 changed files with 14 additions and 10 deletions

View File

@@ -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.*

View File

@@ -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.*

View File

@@ -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))