From 005008814ac248154411556543735975b5f82cf6 Mon Sep 17 00:00:00 2001 From: Shahzain Ali Date: Thu, 8 Dec 2022 21:34:55 +0500 Subject: [PATCH] icon added in cmake. --- client/CMakeLists.txt | 7 ++++++- client/ios/networkextension/CMakeLists.txt | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index e8a5e0f0..1f4dc445 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -377,7 +377,7 @@ if(IOS) # set(CMAKE_XCODE_GENERATE_TOP_LEVEL_PROJECT_ONLY TRUE) set_target_properties(${PROJECT} PROPERTIES XCODE_ATTRIBUTE_ENABLE_BITCODE "NO") - + set_target_properties(${PROJECT} PROPERTIES XCODE_ATTRIBUTE_ASSETCATALOG_COMPILER_APPICON_NAME "AppIcon") set_target_properties(${PROJECT} PROPERTIES XCODE_LINK_BUILD_PHASE_MODE KNOWN_LOCATION) set(CMAKE_XCODE_ATTRIBUTE_LD_RUNPATH_SEARCH_PATHS "@executable_path/Frameworks") @@ -457,6 +457,11 @@ target_include_directories(${PROJECT} PRIVATE ${CMAKE_SOURCE_DIR}) ${CMAKE_SOURCE_DIR}/ios/app/AmneziaVPNLaunchScreen.storyboard 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 + ) + add_subdirectory(ios/networkextension) add_dependencies(${PROJECT} networkextension) set_target_properties(${PROJECT} PROPERTIES XCODE_EMBED_APP_EXTENSIONS networkextension) diff --git a/client/ios/networkextension/CMakeLists.txt b/client/ios/networkextension/CMakeLists.txt index 5a8e76fb..9efc0639 100644 --- a/client/ios/networkextension/CMakeLists.txt +++ b/client/ios/networkextension/CMakeLists.txt @@ -11,7 +11,7 @@ set_target_properties(networkextension PROPERTIES MACOSX_BUNDLE_BUNDLE_VERSION "${BUILD_ID}" MACOSX_BUNDLE_COPYRIGHT "MPL-2.0" MACOSX_BUNDLE_GUI_IDENTIFIER "${BUILD_IOS_APP_IDENTIFIER}.network-extension" - MACOSX_BUNDLE_INFO_STRING "MozillaVPNNetworkExtension" + MACOSX_BUNDLE_INFO_STRING "AmneziaVPNNetworkExtension" MACOSX_BUNDLE_LONG_VERSION_STRING "${CMAKE_PROJECT_VERSION}-${BUILD_ID}" MACOSX_BUNDLE_SHORT_VERSION_STRING "${CMAKE_PROJECT_VERSION}" XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "${BUILD_IOS_APP_IDENTIFIER}.network-extension"