diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index 8d846e2c..16b3aa17 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -1,8 +1,8 @@ cmake_minimum_required(VERSION 3.23.0 FATAL_ERROR) set(PROJECT AmneziaVPN) -project(${PROJECT} VERSION 2.0.10) -set(BUILD_ID 2) +project(${PROJECT} VERSION 2.1.2) +set(BUILD_ID 1) SET(QT_BUILD_TOOLS_WHEN_CROSS_COMPILING ON) set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) @@ -309,6 +309,8 @@ endif() if(IOS) message("Client iOS build") + + find_package(Qt6 REQUIRED COMPONENTS ShaderTools) set(LIBS ${LIBS} Qt6::ShaderTools) @@ -354,6 +356,7 @@ endif() if(CMAKE_OSX_SYSROOT STREQUAL "iphoneos") message("Building for iPhone OS") set(CMAKE_OSX_DEPLOYMENT_TARGET 13.0) + endif() qt_add_executable(${PROJECT} ${SOURCES} ${HEADERS} ${RESOURCES} ${QRC}) @@ -414,6 +417,8 @@ if(IOS) XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS "${CMAKE_SOURCE_DIR}/ios/app/main.entitlements" XCODE_ATTRIBUTE_MARKETING_VERSION "${CMAKE_PROJECT_VERSION}" XCODE_GENERATE_SCHEME TRUE + MACOSX_BUNDLE_ICON_FILE "AppIcon" + ) target_include_directories(${PROJECT} PRIVATE ${CMAKE_SOURCE_DIR}) @@ -456,10 +461,14 @@ if(IOS) PROPERTIES MACOSX_PACKAGE_LOCATION "Resources" ) - target_sources(${PROJECT} PRIVATE ${CMAKE_SOURCE_DIR}/ios/Media.xcassets) - set_source_files_properties(Media.xcassets PROPERTIES - MACOSX_PACKAGE_LOCATION Resources - ) +target_sources(${PROJECT} PRIVATE + ${CMAKE_SOURCE_DIR}/ios/Media.xcassets + +) +set_source_files_properties( + ${CMAKE_SOURCE_DIR}/ios/Media.xcassets + PROPERTIES MACOSX_PACKAGE_LOCATION "Resources" +) add_subdirectory(ios/networkextension) add_dependencies(${PROJECT} networkextension) diff --git a/client/ios/app/Info.plist.in b/client/ios/app/Info.plist.in index 8ef6aacf..97f88953 100644 --- a/client/ios/app/Info.plist.in +++ b/client/ios/app/Info.plist.in @@ -51,6 +51,10 @@ NSCameraUsageDescription Amnezia VPN needs access to the camera for reading QR-codes. + CFBundleIcons + + CFBundleIcons~ipad + UTImportedTypeDeclarations