From 599dad87a7e97dc9610d1d3c6d56784c21637e1a Mon Sep 17 00:00:00 2001
From: Macbook <macbook@MacBook-Pro-cua-Macbook.local>
Date: Fri, 8 Nov 2024 21:09:15 +0700
Subject: [PATCH] archive success

---
 client/3rd-prebuilt                          |  2 +-
 client/3rd/OpenVPNAdapter                    |  2 +-
 client/cmake/macos_ne.cmake                  |  8 ++++++
 client/macos/networkextension/CMakeLists.txt | 28 ++++++++++----------
 4 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/client/3rd-prebuilt b/client/3rd-prebuilt
index 435aaa793..529178b87 160000
--- a/client/3rd-prebuilt
+++ b/client/3rd-prebuilt
@@ -1 +1 @@
-Subproject commit 435aaa793d8ce455ef4a3b2f5ff5e38f187d8efb
+Subproject commit 529178b87eb25f4fd630fa053298707f601b33e3
diff --git a/client/3rd/OpenVPNAdapter b/client/3rd/OpenVPNAdapter
index d10da3661..e1e20dd02 160000
--- a/client/3rd/OpenVPNAdapter
+++ b/client/3rd/OpenVPNAdapter
@@ -1 +1 @@
-Subproject commit d10da3661d9ff41725b75292d6a451763e997415
+Subproject commit e1e20dd02ea87ff850f0f86cb7dc8afa7cb42b51
diff --git a/client/cmake/macos_ne.cmake b/client/cmake/macos_ne.cmake
index dc2e2ded9..ad12069a2 100644
--- a/client/cmake/macos_ne.cmake
+++ b/client/cmake/macos_ne.cmake
@@ -137,3 +137,11 @@ message("QtCore_location")
 message(${QtCore_location})
 
 get_filename_component(QT_BIN_DIR_DETECTED "${QtCore_location}/../../../../../bin" ABSOLUTE)
+
+set_property(TARGET ${PROJECT} PROPERTY XCODE_EMBED_FRAMEWORKS
+    "${CMAKE_CURRENT_SOURCE_DIR}/3rd/OpenVPNAdapter/build/Release-macos/OpenVPNAdapter.framework"
+)
+
+set(CMAKE_XCODE_ATTRIBUTE_FRAMEWORK_SEARCH_PATHS ${CMAKE_CURRENT_SOURCE_DIR}/3rd/OpenVPNAdapter/build/Release-macos)
+target_link_libraries("networkextension" PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/3rd/OpenVPNAdapter/build/Release-macos/OpenVPNAdapter.framework")
+
diff --git a/client/macos/networkextension/CMakeLists.txt b/client/macos/networkextension/CMakeLists.txt
index 7fc6cd677..bbc5b59f6 100644
--- a/client/macos/networkextension/CMakeLists.txt
+++ b/client/macos/networkextension/CMakeLists.txt
@@ -86,23 +86,23 @@ find_library(FW_LIBRESOLV libresolv.9.tbd)
 set(CLIENT_ROOT_DIR ${CMAKE_CURRENT_LIST_DIR}/../..)
 
 set(CMAKE_FRAMEWORK_PATH ${CLIENT_ROOT_DIR}/3rd/OpenVPNAdapter/build/Release-macos)
-message("CMAKE_FRAMEWORK_PATH is: ${CMAKE_FRAMEWORK_PATH}")
-# framework OpenVPNAdapter
-set_property(TARGET networkextension PROPERTY XCODE_EMBED_FRAMEWORKS
-    ${CMAKE_FRAMEWORK_PATH}/OpenVPNAdapter.framework
-)
+# message("CMAKE_FRAMEWORK_PATH is: ${CMAKE_FRAMEWORK_PATH}")
+# # framework OpenVPNAdapter
+# # set_property(TARGET networkextension PROPERTY XCODE_EMBED_FRAMEWORKS
+# #     ${CMAKE_FRAMEWORK_PATH}/OpenVPNAdapter.framework
+# # )
 
-target_link_libraries(networkextension PRIVATE
-    ${CMAKE_FRAMEWORK_PATH}/OpenVPNAdapter.framework
-)
+# target_link_libraries(networkextension PRIVATE
+#     ${CMAKE_FRAMEWORK_PATH}/OpenVPNAdapter.framework
+# )
 
-target_include_directories(networkextension PRIVATE
-    ${CLIENT_ROOT_DIR}/3rd/OpenVPNAdapter/build/Release-macos/OpenVPNAdapter.framework/Headers
-)
+# target_include_directories(networkextension PRIVATE
+#     ${CLIENT_ROOT_DIR}/3rd/OpenVPNAdapter/build/Release-macos/OpenVPNAdapter.framework/Headers
+# )
 
-target_link_libraries(networkextension PRIVATE 
-    "-framework OpenVPNAdapter"
-)
+# target_link_libraries(networkextension PRIVATE 
+#     "-framework OpenVPNAdapter"
+# )
 
 target_link_libraries(networkextension PRIVATE ${FW_LIBRESOLV})