andrei/amnezia-client
1
0
Fork 0
mirror of https://github.com/amnezia-vpn/amnezia-client.git synced 2026-06-23 02:00:20 +07:00
Code Issues Packages Projects Releases 10 Wiki Activity

archive success

Browse Source
This commit is contained in:
Macbook
2024-11-08 21:09:15 +07:00
parent 4532a9114f
commit 599dad87a7
4 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/3rd-prebuilt
+1 -1
Submodule client/3rd-prebuilt updated: 435aaa793d...529178b87e
client/3rd/OpenVPNAdapter
Vendored
+1 -1
Submodule client/3rd/OpenVPNAdapter updated: d10da3661d...e1e20dd02e
client/cmake/macos_ne.cmake
+8
View File
@@ -137,3 +137,11 @@ message("QtCore_location")
message(${QtCore_location}) message(${QtCore_location})
get_filename_component(QT_BIN_DIR_DETECTED "${QtCore_location}/../../../../../bin" ABSOLUTE) 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")
client/macos/networkextension/CMakeLists.txt
+14 -14
View File
@@ -86,23 +86,23 @@ find_library(FW_LIBRESOLV libresolv.9.tbd)
set(CLIENT_ROOT_DIR ${CMAKE_CURRENT_LIST_DIR}/../..) set(CLIENT_ROOT_DIR ${CMAKE_CURRENT_LIST_DIR}/../..)
set(CMAKE_FRAMEWORK_PATH ${CLIENT_ROOT_DIR}/3rd/OpenVPNAdapter/build/Release-macos) set(CMAKE_FRAMEWORK_PATH ${CLIENT_ROOT_DIR}/3rd/OpenVPNAdapter/build/Release-macos)
message("CMAKE_FRAMEWORK_PATH is: ${CMAKE_FRAMEWORK_PATH}") # message("CMAKE_FRAMEWORK_PATH is: ${CMAKE_FRAMEWORK_PATH}")
# framework OpenVPNAdapter # # framework OpenVPNAdapter
set_property(TARGET networkextension PROPERTY XCODE_EMBED_FRAMEWORKS # # set_property(TARGET networkextension PROPERTY XCODE_EMBED_FRAMEWORKS
${CMAKE_FRAMEWORK_PATH}/OpenVPNAdapter.framework # # ${CMAKE_FRAMEWORK_PATH}/OpenVPNAdapter.framework
) # # )
target_link_libraries(networkextension PRIVATE # target_link_libraries(networkextension PRIVATE
${CMAKE_FRAMEWORK_PATH}/OpenVPNAdapter.framework # ${CMAKE_FRAMEWORK_PATH}/OpenVPNAdapter.framework
) # )
target_include_directories(networkextension PRIVATE # target_include_directories(networkextension PRIVATE
${CLIENT_ROOT_DIR}/3rd/OpenVPNAdapter/build/Release-macos/OpenVPNAdapter.framework/Headers # ${CLIENT_ROOT_DIR}/3rd/OpenVPNAdapter/build/Release-macos/OpenVPNAdapter.framework/Headers
) # )
target_link_libraries(networkextension PRIVATE # target_link_libraries(networkextension PRIVATE
"-framework OpenVPNAdapter" # "-framework OpenVPNAdapter"
) # )
target_link_libraries(networkextension PRIVATE ${FW_LIBRESOLV}) target_link_libraries(networkextension PRIVATE ${FW_LIBRESOLV})