backend-infra-engineer: Release v0.3.9-hotfix7 snapshot

cmake/packaging/cpack.cmake

@@ -1,9 +1,13 @@
-# CPack Configuration
-# Cross-platform packaging using CPack
-# NOTE: include(CPack) MUST be called at the END of this file,
-# after all CPACK_ variables and install() rules are defined.
+# CPack Configuration - flat packages for all platforms
+#
+# Structure:
+#   root/
+#     yaze(.exe)
+#     z3ed(.exe)           (if built)
+#     README.md
+#     LICENSE
+#     assets/...
 
-# Set package information
 set(CPACK_PACKAGE_NAME "yaze")
 set(CPACK_PACKAGE_VENDOR "scawful")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Yet Another Zelda3 Editor")
@@ -11,82 +15,93 @@ set(CPACK_PACKAGE_VERSION_MAJOR ${YAZE_VERSION_MAJOR})
 set(CPACK_PACKAGE_VERSION_MINOR ${YAZE_VERSION_MINOR})
 set(CPACK_PACKAGE_VERSION_PATCH ${YAZE_VERSION_PATCH})
 set(CPACK_PACKAGE_VERSION "${YAZE_VERSION_MAJOR}.${YAZE_VERSION_MINOR}.${YAZE_VERSION_PATCH}")
-
-# Set package directory
 set(CPACK_PACKAGE_DIRECTORY "${CMAKE_BINARY_DIR}/packages")
-
-# Platform-specific packaging
-if(APPLE)
-  include(cmake/packaging/macos.cmake)
-elseif(WIN32)
-  include(cmake/packaging/windows.cmake)
-elseif(UNIX)
-  include(cmake/packaging/linux.cmake)
-endif()
-
-# Common files to include
 set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE")
 set(CPACK_RESOURCE_FILE_README "${CMAKE_SOURCE_DIR}/README.md")
 
-# Set default component
 set(CPACK_COMPONENTS_ALL yaze)
 set(CPACK_COMPONENT_YAZE_DISPLAY_NAME "YAZE Editor")
 set(CPACK_COMPONENT_YAZE_DESCRIPTION "Main YAZE application and libraries")
 
-# Install rules - these define what CPack packages
-include(GNUInstallDirs)
+# Populate runtime library list (needed on Windows)
+set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS ON)
+set(CMAKE_INSTALL_UCRT_LIBRARIES ON)
+include(InstallRequiredSystemLibraries)
 
-# Platform-specific install paths
-# The asset paths must match what platform_paths.cc FindAsset() searches for
-if(WIN32)
-    # Windows: flat structure (exe and assets/ at same level)
-    set(YAZE_INSTALL_BINDIR ".")
-    set(YAZE_INSTALL_DATADIR ".")
-    set(YAZE_INSTALL_DOCDIR ".")
-elseif(APPLE)
-    # macOS: flat structure for DMG (app bundle handles its own resources)
-    set(YAZE_INSTALL_BINDIR ".")
-    set(YAZE_INSTALL_DATADIR ".")
-    set(YAZE_INSTALL_DOCDIR ".")
-else()
-    # Linux: FHS structure - assets at share/yaze/assets (matches FindAsset search)
-    set(YAZE_INSTALL_BINDIR ${CMAKE_INSTALL_BINDIR})
-    set(YAZE_INSTALL_DATADIR "${CMAKE_INSTALL_DATADIR}/yaze")
-    set(YAZE_INSTALL_DOCDIR "${CMAKE_INSTALL_DOCDIR}")
-endif()
-
-# Install main executable
 if(APPLE)
+    include(cmake/packaging/macos.cmake)
+
     install(TARGETS yaze
-        RUNTIME DESTINATION ${YAZE_INSTALL_BINDIR}
         BUNDLE DESTINATION .
-        COMPONENT yaze
-    )
-else()
+        COMPONENT yaze)
+
+    if(TARGET z3ed)
+        install(TARGETS z3ed
+            RUNTIME DESTINATION .
+            COMPONENT yaze)
+    endif()
+
+    install(DIRECTORY ${CMAKE_SOURCE_DIR}/assets/
+        DESTINATION assets
+        COMPONENT yaze)
+
+    install(FILES
+        ${CMAKE_SOURCE_DIR}/README.md
+        ${CMAKE_SOURCE_DIR}/LICENSE
+        DESTINATION .
+        COMPONENT yaze)
+
+elseif(WIN32)
+    include(cmake/packaging/windows.cmake)
+
     install(TARGETS yaze
-        RUNTIME DESTINATION ${YAZE_INSTALL_BINDIR}
-        COMPONENT yaze
-    )
+        RUNTIME DESTINATION .
+        COMPONENT yaze)
+
+    if(TARGET z3ed)
+        install(TARGETS z3ed
+            RUNTIME DESTINATION .
+            COMPONENT yaze)
+    endif()
+
+    install(DIRECTORY ${CMAKE_SOURCE_DIR}/assets/
+        DESTINATION assets
+        COMPONENT yaze)
+
+    install(FILES
+        ${CMAKE_SOURCE_DIR}/README.md
+        ${CMAKE_SOURCE_DIR}/LICENSE
+        DESTINATION .
+        COMPONENT yaze)
+
+    if(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS)
+        install(FILES ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS}
+            DESTINATION .
+            COMPONENT yaze)
+    endif()
+
+else()
+    include(cmake/packaging/linux.cmake)
+
+    install(TARGETS yaze
+        RUNTIME DESTINATION .
+        COMPONENT yaze)
+
+    if(TARGET z3ed)
+        install(TARGETS z3ed
+            RUNTIME DESTINATION .
+            COMPONENT yaze)
+    endif()
+
+    install(DIRECTORY ${CMAKE_SOURCE_DIR}/assets/
+        DESTINATION assets
+        COMPONENT yaze)
+
+    install(FILES
+        ${CMAKE_SOURCE_DIR}/README.md
+        ${CMAKE_SOURCE_DIR}/LICENSE
+        DESTINATION .
+        COMPONENT yaze)
 endif()
 
-# Install assets
-install(DIRECTORY ${CMAKE_SOURCE_DIR}/assets/
-    DESTINATION ${YAZE_INSTALL_DATADIR}/assets
-    COMPONENT yaze
-    PATTERN "*.png"
-    PATTERN "*.ttf"
-    PATTERN "*.asm"
-)
-
-# Install documentation
-install(FILES
-    ${CMAKE_SOURCE_DIR}/README.md
-    ${CMAKE_SOURCE_DIR}/LICENSE
-    DESTINATION ${YAZE_INSTALL_DOCDIR}
-    COMPONENT yaze
-)
-
-# IMPORTANT: include(CPack) must be called LAST, after all CPACK_ variables
-# and install() rules are defined. This is a CPack requirement.
 include(CPack)
-