From 19f9125557e54b14089b4dd40c6cda894fcbccbc Mon Sep 17 00:00:00 2001
From: Shinichi Hanayama <hanatyan@opensphere.co.jp>
Date: Thu, 19 Dec 2024 20:07:36 +0900
Subject: [PATCH] - Fix packaging didn't pack dependencies properly.

---
 CMakeLists.txt | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 106f8e0..91144f7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -110,8 +110,6 @@ target_include_directories(
   PRIVATE ${CMAKE_SOURCE_DIR}/lib/o2/src ${CMAKE_SOURCE_DIR}/shared/properties-view
           ${CMAKE_SOURCE_DIR}/shared/qt/vertical-scroll-area ${CMAKE_SOURCE_DIR}/shared/qt/wrappers)
 
-set_target_properties_plugin(${CMAKE_PROJECT_NAME} PROPERTIES OUTPUT_NAME ${_name})
-
 if(NOT buildspec)
   file(READ "${CMAKE_CURRENT_SOURCE_DIR}/buildspec.json" buildspec)
 endif()
@@ -124,26 +122,30 @@ string(
   qt6
   version)
 
-if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
+if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin")
   install(
-    FILES "${CMAKE_SOURCE_DIR}/.deps/obs-deps-qt6-${qtversion}-x64/bin/Qt6WebSockets.dll"
+    DIRECTORY "${CMAKE_SOURCE_DIR}/.deps/obs-deps-qt6-${qtversion}-universal/lib/QtWebSockets.framework"
     CONFIGURATIONS RelWithDebInfo Debug Release
-    DESTINATION bin/64bit
+    DESTINATION "${CMAKE_PROJECT_NAME}.plugin/Contents/Frameworks"
     OPTIONAL)
   install(
-    DIRECTORY "${CMAKE_SOURCE_DIR}/.deps/obs-deps-qt6-${qtversion}-x64/plugins/tls"
+    DIRECTORY "${CMAKE_SOURCE_DIR}/.deps/obs-deps-qt6-${qtversion}-universal/plugins/tls"
     CONFIGURATIONS RelWithDebInfo Debug Release
-    DESTINATION bin/64bit
+    DESTINATION "${CMAKE_PROJECT_NAME}.plugin/Contents/Frameworks"
     OPTIONAL)
-elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin")
+endif()
+
+set_target_properties_plugin(${CMAKE_PROJECT_NAME} PROPERTIES OUTPUT_NAME ${_name})
+
+if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
   install(
-    DIRECTORY "${CMAKE_SOURCE_DIR}/.deps/obs-deps-qt6-${qtversion}-universal/lib/QtWebSockets.framework"
+    FILES "${CMAKE_SOURCE_DIR}/.deps/obs-deps-qt6-${qtversion}-x64/bin/Qt6WebSockets.dll"
     CONFIGURATIONS RelWithDebInfo Debug Release
-    DESTINATION "${CMAKE_PROJECT_NAME}.plugin/Contents/Frameworks"
+    DESTINATION bin/64bit
     OPTIONAL)
   install(
-    DIRECTORY "${CMAKE_SOURCE_DIR}/.deps/obs-deps-qt6-${qtversion}-universal/plugins/tls"
+    DIRECTORY "${CMAKE_SOURCE_DIR}/.deps/obs-deps-qt6-${qtversion}-x64/plugins/tls"
     CONFIGURATIONS RelWithDebInfo Debug Release
-    DESTINATION "${CMAKE_PROJECT_NAME}.plugin/Contents/Frameworks"
+    DESTINATION bin/64bit
     OPTIONAL)
 endif()