059257fc58
* refactoring: improved the performance of secure_settings * bugfix: fixed textFields on PageSetupWizardCredentials * bugfix: fixed scrolling by keys on PageSettingsApiServerInfo * chore: hide site links for ios (#1374) * chore: fixed log output with split tunneling info * chore: hide "open logs folder" button for mobule platforms * chore: fixed again log output with split tunneling info * chore: bump version * Install apparmor (#1379) Install apparmor * chore: returned the backup page for androidTV * Enable PFS for Windows IKEv2 * refactoring: moved api info pages from ServerInfo * refactoring: moved gateway interaction functions to a separate class * bugfix: fixed storeEndpoint parsing * chore: returned links for mobile platforms * Update VPN protocol descriptions * Update VPN description texts * feature: added pages for subscription settings feature * feature: added page for export api native configs * feature: added error handling and minor ui fixes * refactor: update ios build configuration to use automatic code signing and prebuilt OpenVPNAdapter framework * feat: remove OpenVPNAdapter submodule * feat: remove ios openvpn script and associated cmake configuration * Update README.md * Update README_RU.md * Update README.md fix link * feature: added share vpn key to subscription settings page * bugfix: fixed possible crush on android * add timeouts in ipc client init * apply timeouts only for Windows * apply format to file * refactoring: simplified the validity check of the config before connection - improved project structure * bugfix: fixed visability of share drawer * feature: added 409 error handling from server response * chore: fixed android build * chore: fixed qr code display * Rewrite timeouts using waitForSource * feature: added error messages handler * feature: added issued configs info parsing * feature: added functionality to revoke api configs * chore: added links to instructions * chore: fixed qr code with vpnkey processing * chore: fixed native config post processing * chore: added link to android tv instruction * change node to IpcProcessTun2SocksReplica * chore: minor ui fixes * Update Windows OpenSSL (#1426) * Update Windows OpenSSL to 3.0.16 and add shared library for QSslSocket plugin * chore: update link to submodule 3rd-prebuild --------- Co-authored-by: vladimir.kuznetsov <nethiuswork@gmail.com> * chore: added 404 handling for revoke configs - added revoke before remove api server for premium v2 * chore: added log to see proxy decrypt errors * chore: minor ui fix * chore: bump version * bugfix: fixed mobile controllers initialization (#1436) * bugfix: fixed mobile controllers initialization * chore: bump version * Merge pull request #1440 from amnezia-vpn/feature/subscription-settings-page feature/subscription settings page --------- Co-authored-by: vladimir.kuznetsov <nethiuswork@gmail.com> Co-authored-by: pokamest <pokamest@gmail.com> Co-authored-by: Mykola Baibuz <mykola.baibuz@gmail.com> Co-authored-by: Yaroslav Yashin <yaroslav.yashin@gmail.com> Co-authored-by: KsZnak <ksu@amnezia.org> Co-authored-by: Cyril Anisimov <CyAn84@gmail.com>
130 lines
5.4 KiB
CMake
130 lines
5.4 KiB
CMake
message("Client iOS build")
|
|
set(CMAKE_OSX_DEPLOYMENT_TARGET 13.0)
|
|
set(APPLE_PROJECT_VERSION ${CMAKE_PROJECT_VERSION_MAJOR}.${CMAKE_PROJECT_VERSION_MINOR}.${CMAKE_PROJECT_VERSION_PATCH})
|
|
|
|
|
|
enable_language(OBJC)
|
|
enable_language(OBJCXX)
|
|
enable_language(Swift)
|
|
|
|
find_package(Qt6 REQUIRED COMPONENTS ShaderTools)
|
|
set(LIBS ${LIBS} Qt6::ShaderTools)
|
|
|
|
find_library(FW_AUTHENTICATIONSERVICES AuthenticationServices)
|
|
find_library(FW_UIKIT UIKit)
|
|
find_library(FW_AVFOUNDATION AVFoundation)
|
|
find_library(FW_FOUNDATION Foundation)
|
|
find_library(FW_STOREKIT StoreKit)
|
|
find_library(FW_USERNOTIFICATIONS UserNotifications)
|
|
find_library(FW_NETWORKEXTENSION NetworkExtension)
|
|
|
|
set(LIBS ${LIBS}
|
|
${FW_AUTHENTICATIONSERVICES}
|
|
${FW_UIKIT}
|
|
${FW_AVFOUNDATION}
|
|
${FW_FOUNDATION}
|
|
${FW_STOREKIT}
|
|
${FW_USERNOTIFICATIONS}
|
|
${FW_NETWORKEXTENSION}
|
|
)
|
|
|
|
|
|
set(HEADERS ${HEADERS}
|
|
${CMAKE_CURRENT_SOURCE_DIR}/platforms/ios/ios_controller.h
|
|
${CMAKE_CURRENT_SOURCE_DIR}/platforms/ios/ios_controller_wrapper.h
|
|
${CMAKE_CURRENT_SOURCE_DIR}/platforms/ios/iosnotificationhandler.h
|
|
${CMAKE_CURRENT_SOURCE_DIR}/platforms/ios/QtAppDelegate.h
|
|
${CMAKE_CURRENT_SOURCE_DIR}/platforms/ios/QtAppDelegate-C-Interface.h
|
|
)
|
|
set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/platforms/ios/ios_controller.h PROPERTIES OBJECTIVE_CPP_HEADER TRUE)
|
|
|
|
|
|
set(SOURCES ${SOURCES}
|
|
${CMAKE_CURRENT_SOURCE_DIR}/platforms/ios/ios_controller.mm
|
|
${CMAKE_CURRENT_SOURCE_DIR}/platforms/ios/ios_controller_wrapper.mm
|
|
${CMAKE_CURRENT_SOURCE_DIR}/platforms/ios/iosnotificationhandler.mm
|
|
${CMAKE_CURRENT_SOURCE_DIR}/platforms/ios/iosglue.mm
|
|
${CMAKE_CURRENT_SOURCE_DIR}/platforms/ios/QRCodeReaderBase.mm
|
|
${CMAKE_CURRENT_SOURCE_DIR}/platforms/ios/QtAppDelegate.mm
|
|
)
|
|
|
|
|
|
target_include_directories(${PROJECT} PRIVATE ${Qt6Gui_PRIVATE_INCLUDE_DIRS})
|
|
|
|
|
|
set_target_properties(${PROJECT} PROPERTIES
|
|
XCODE_LINK_BUILD_PHASE_MODE KNOWN_LOCATION
|
|
MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/ios/app/Info.plist.in
|
|
MACOSX_BUNDLE_ICON_FILE "AppIcon"
|
|
MACOSX_BUNDLE_INFO_STRING "AmneziaVPN"
|
|
MACOSX_BUNDLE_BUNDLE_NAME "AmneziaVPN"
|
|
MACOSX_BUNDLE_GUI_IDENTIFIER "${BUILD_IOS_APP_IDENTIFIER}"
|
|
MACOSX_BUNDLE_BUNDLE_VERSION "${CMAKE_PROJECT_VERSION_TWEAK}"
|
|
MACOSX_BUNDLE_LONG_VERSION_STRING "${APPLE_PROJECT_VERSION}-${CMAKE_PROJECT_VERSION_TWEAK}"
|
|
MACOSX_BUNDLE_SHORT_VERSION_STRING "${APPLE_PROJECT_VERSION}"
|
|
XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "${BUILD_IOS_APP_IDENTIFIER}"
|
|
XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS "${CMAKE_CURRENT_SOURCE_DIR}/ios/app/main.entitlements"
|
|
XCODE_ATTRIBUTE_MARKETING_VERSION "${APPLE_PROJECT_VERSION}"
|
|
XCODE_ATTRIBUTE_CURRENT_PROJECT_VERSION "${CMAKE_PROJECT_VERSION_TWEAK}"
|
|
XCODE_ATTRIBUTE_PRODUCT_NAME "AmneziaVPN"
|
|
XCODE_ATTRIBUTE_BUNDLE_INFO_STRING "AmneziaVPN"
|
|
XCODE_GENERATE_SCHEME TRUE
|
|
XCODE_ATTRIBUTE_ENABLE_BITCODE "NO"
|
|
XCODE_ATTRIBUTE_ASSETCATALOG_COMPILER_APPICON_NAME "AppIcon"
|
|
XCODE_ATTRIBUTE_TARGETED_DEVICE_FAMILY "1,2"
|
|
XCODE_EMBED_FRAMEWORKS_CODE_SIGN_ON_COPY ON
|
|
XCODE_LINK_BUILD_PHASE_MODE KNOWN_LOCATION
|
|
XCODE_ATTRIBUTE_LD_RUNPATH_SEARCH_PATHS "@executable_path/Frameworks"
|
|
XCODE_EMBED_APP_EXTENSIONS networkextension
|
|
XCODE_ATTRIBUTE_CODE_SIGN_STYLE Automatic
|
|
)
|
|
set_target_properties(${PROJECT} PROPERTIES
|
|
XCODE_ATTRIBUTE_SWIFT_VERSION "5.0"
|
|
XCODE_ATTRIBUTE_CLANG_ENABLE_MODULES "YES"
|
|
XCODE_ATTRIBUTE_SWIFT_PRECOMPILE_BRIDGING_HEADER "NO"
|
|
XCODE_ATTRIBUTE_SWIFT_OBJC_INTERFACE_HEADER_NAME "AmneziaVPN-Swift.h"
|
|
XCODE_ATTRIBUTE_SWIFT_OBJC_INTEROP_MODE "objcxx"
|
|
)
|
|
set_target_properties(${PROJECT} PROPERTIES
|
|
XCODE_ATTRIBUTE_DEVELOPMENT_TEAM "X7UJ388FXK"
|
|
)
|
|
target_include_directories(${PROJECT} PRIVATE ${CMAKE_CURRENT_LIST_DIR})
|
|
target_compile_options(${PROJECT} PRIVATE
|
|
-DGROUP_ID=\"${BUILD_IOS_GROUP_IDENTIFIER}\"
|
|
-DVPN_NE_BUNDLEID=\"${BUILD_IOS_APP_IDENTIFIER}.network-extension\"
|
|
)
|
|
|
|
set(WG_APPLE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/3rd/amneziawg-apple/Sources)
|
|
|
|
target_sources(${PROJECT} PRIVATE
|
|
# ${CMAKE_CURRENT_SOURCE_DIR}/platforms/ios/iosvpnprotocol.swift
|
|
${WG_APPLE_SOURCE_DIR}/WireGuardKitC/x25519.c
|
|
${CLIENT_ROOT_DIR}/platforms/ios/LogController.swift
|
|
${CLIENT_ROOT_DIR}/platforms/ios/Log.swift
|
|
${CLIENT_ROOT_DIR}/platforms/ios/LogRecord.swift
|
|
${CLIENT_ROOT_DIR}/platforms/ios/ScreenProtection.swift
|
|
${CLIENT_ROOT_DIR}/platforms/ios/VPNCController.swift
|
|
)
|
|
|
|
target_sources(${PROJECT} PRIVATE
|
|
${CMAKE_CURRENT_SOURCE_DIR}/ios/app/AmneziaVPNLaunchScreen.storyboard
|
|
${CMAKE_CURRENT_SOURCE_DIR}/ios/app/Media.xcassets
|
|
${CMAKE_CURRENT_SOURCE_DIR}/ios/app/PrivacyInfo.xcprivacy
|
|
)
|
|
|
|
set_property(TARGET ${PROJECT} APPEND PROPERTY RESOURCE
|
|
${CMAKE_CURRENT_SOURCE_DIR}/ios/app/AmneziaVPNLaunchScreen.storyboard
|
|
${CMAKE_CURRENT_SOURCE_DIR}/ios/app/Media.xcassets
|
|
${CMAKE_CURRENT_SOURCE_DIR}/ios/app/PrivacyInfo.xcprivacy
|
|
)
|
|
|
|
add_subdirectory(ios/networkextension)
|
|
add_dependencies(${PROJECT} networkextension)
|
|
|
|
set_property(TARGET ${PROJECT} PROPERTY XCODE_EMBED_FRAMEWORKS
|
|
"${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/openvpn/apple/OpenVPNAdapter-ios/OpenVPNAdapter.framework"
|
|
)
|
|
|
|
set(CMAKE_XCODE_ATTRIBUTE_FRAMEWORK_SEARCH_PATHS ${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/openvpn/apple/OpenVPNAdapter-ios/)
|
|
target_link_libraries("networkextension" PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/openvpn/apple/OpenVPNAdapter-ios/OpenVPNAdapter.framework")
|
|
|