AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Setting target membership on Media.xcassets

Browse source
This commit is contained in:
Shahzain Ali 2022-12-14 16:56:20 +05:00
parent 9c188e0acd
commit ebd920f3b2
2 changed files with 19 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

21
client/CMakeLists.txt
View file

@ -1,8 +1,8 @@
cmake_minimum_required(VERSION 3.23.0 FATAL_ERROR) cmake_minimum_required(VERSION 3.23.0 FATAL_ERROR)
set(PROJECT AmneziaVPN) set(PROJECT AmneziaVPN)
project(${PROJECT} VERSION 2.0.10) project(${PROJECT} VERSION 2.1.2)
set(BUILD_ID 2) set(BUILD_ID 1)
SET(QT_BUILD_TOOLS_WHEN_CROSS_COMPILING ON) SET(QT_BUILD_TOOLS_WHEN_CROSS_COMPILING ON)
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
@ -309,6 +309,8 @@ endif()
if(IOS) if(IOS)
message("Client iOS build") message("Client iOS build")
find_package(Qt6 REQUIRED COMPONENTS ShaderTools) find_package(Qt6 REQUIRED COMPONENTS ShaderTools)
set(LIBS ${LIBS} Qt6::ShaderTools) set(LIBS ${LIBS} Qt6::ShaderTools)
@ -354,6 +356,7 @@ endif()
if(CMAKE_OSX_SYSROOT STREQUAL "iphoneos") if(CMAKE_OSX_SYSROOT STREQUAL "iphoneos")
message("Building for iPhone OS") message("Building for iPhone OS")
set(CMAKE_OSX_DEPLOYMENT_TARGET 13.0) set(CMAKE_OSX_DEPLOYMENT_TARGET 13.0)
endif() endif()
qt_add_executable(${PROJECT} ${SOURCES} ${HEADERS} ${RESOURCES} ${QRC}) 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_CODE_SIGN_ENTITLEMENTS "${CMAKE_SOURCE_DIR}/ios/app/main.entitlements"
XCODE_ATTRIBUTE_MARKETING_VERSION "${CMAKE_PROJECT_VERSION}" XCODE_ATTRIBUTE_MARKETING_VERSION "${CMAKE_PROJECT_VERSION}"
XCODE_GENERATE_SCHEME TRUE XCODE_GENERATE_SCHEME TRUE
MACOSX_BUNDLE_ICON_FILE "AppIcon"
) )
target_include_directories(${PROJECT} PRIVATE ${CMAKE_SOURCE_DIR}) target_include_directories(${PROJECT} PRIVATE ${CMAKE_SOURCE_DIR})
@ -456,10 +461,14 @@ if(IOS)
PROPERTIES MACOSX_PACKAGE_LOCATION "Resources" PROPERTIES MACOSX_PACKAGE_LOCATION "Resources"
) )
target_sources(${PROJECT} PRIVATE ${CMAKE_SOURCE_DIR}/ios/Media.xcassets) target_sources(${PROJECT} PRIVATE
set_source_files_properties(Media.xcassets PROPERTIES ${CMAKE_SOURCE_DIR}/ios/Media.xcassets
MACOSX_PACKAGE_LOCATION Resources
) )
set_source_files_properties(
${CMAKE_SOURCE_DIR}/ios/Media.xcassets
PROPERTIES MACOSX_PACKAGE_LOCATION "Resources"
)
add_subdirectory(ios/networkextension) add_subdirectory(ios/networkextension)
add_dependencies(${PROJECT} networkextension) add_dependencies(${PROJECT} networkextension)

4
client/ios/app/Info.plist.in
View file

@ -51,6 +51,10 @@
<true/> <true/>
<key>NSCameraUsageDescription</key> <key>NSCameraUsageDescription</key>
<string>Amnezia VPN needs access to the camera for reading QR-codes.</string> <string>Amnezia VPN needs access to the camera for reading QR-codes.</string>
<key>CFBundleIcons</key>
<dict/>
<key>CFBundleIcons~ipad</key>
<dict/>
<key>UTImportedTypeDeclarations</key> <key>UTImportedTypeDeclarations</key>
<array> <array>
<dict> <dict>