From 39056546599fa6327e1ccb72b48f85e3ce96fbe6 Mon Sep 17 00:00:00 2001 From: halx99 Date: Thu, 12 Aug 2021 15:54:16 +0800 Subject: [PATCH] Fix xcode build warnings --- templates/cpp-template-default/CMakeLists.txt | 1 + templates/cpp-template-default/proj.ios_mac/ios/Info.plist | 2 +- templates/cpp-template-default/proj.ios_mac/mac/Info.plist | 2 +- templates/lua-template-default/CMakeLists.txt | 1 + .../frameworks/runtime-src/proj.ios_mac/ios/Info.plist | 2 +- .../frameworks/runtime-src/proj.ios_mac/mac/Info.plist | 2 +- tests/cpp-tests/CMakeLists.txt | 1 + tests/cpp-tests/proj.ios/Info.plist | 2 +- tests/cpp-tests/proj.mac/Info.plist | 2 +- tests/fairygui-tests/CMakeLists.txt | 1 + tests/fairygui-tests/proj.ios/Info.plist | 2 +- tests/fairygui-tests/proj.mac/Info.plist | 2 +- tests/lua-tests/project/CMakeLists.txt | 1 + tests/lua-tests/project/proj.ios_mac/mac/Info.plist | 2 +- 14 files changed, 14 insertions(+), 9 deletions(-) diff --git a/templates/cpp-template-default/CMakeLists.txt b/templates/cpp-template-default/CMakeLists.txt index 33226e0dd2..33c8f4f263 100644 --- a/templates/cpp-template-default/CMakeLists.txt +++ b/templates/cpp-template-default/CMakeLists.txt @@ -147,6 +147,7 @@ setup_cocos_app_config(${APP_NAME}) if(APPLE) set_target_properties(${APP_NAME} PROPERTIES RESOURCE "${APP_UI_RES}") set_xcode_property(${APP_NAME} INSTALL_PATH "\$(LOCAL_APPS_DIR)") + set_xcode_property(${APP_NAME} PRODUCT_BUNDLE_IDENTIFIER "org.adxe.hellocpp") if(MACOSX) set_target_properties(${APP_NAME} PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/proj.ios_mac/mac/Info.plist") diff --git a/templates/cpp-template-default/proj.ios_mac/ios/Info.plist b/templates/cpp-template-default/proj.ios_mac/ios/Info.plist index bfe2e3a8db..6a5e22f8a6 100644 --- a/templates/cpp-template-default/proj.ios_mac/ios/Info.plist +++ b/templates/cpp-template-default/proj.ios_mac/ios/Info.plist @@ -11,7 +11,7 @@ CFBundleIconFile Icon-57.png CFBundleIdentifier - org.cocos2dx.hellocpp + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/templates/cpp-template-default/proj.ios_mac/mac/Info.plist b/templates/cpp-template-default/proj.ios_mac/mac/Info.plist index 55725148bf..18d51ff076 100644 --- a/templates/cpp-template-default/proj.ios_mac/mac/Info.plist +++ b/templates/cpp-template-default/proj.ios_mac/mac/Info.plist @@ -9,7 +9,7 @@ CFBundleIconFile Icon CFBundleIdentifier - org.cocos2dx.hellocpp + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/templates/lua-template-default/CMakeLists.txt b/templates/lua-template-default/CMakeLists.txt index 52cbb10ec0..4f95733fa9 100644 --- a/templates/lua-template-default/CMakeLists.txt +++ b/templates/lua-template-default/CMakeLists.txt @@ -138,6 +138,7 @@ setup_cocos_app_config(${APP_NAME}) if(APPLE) set_target_properties(${APP_NAME} PROPERTIES RESOURCE "${APP_UI_RES}") set_xcode_property(${APP_NAME} INSTALL_PATH "\$(LOCAL_APPS_DIR)") + set_xcode_property(${APP_NAME} PRODUCT_BUNDLE_IDENTIFIER "org.adxe.hellolua") if(MACOSX) set_target_properties(${APP_NAME} PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${RUNTIME_SRC_ROOT}/proj.ios_mac/mac/Info.plist" diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Info.plist b/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Info.plist index fddda705dd..68e862c17c 100644 --- a/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Info.plist +++ b/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Info.plist @@ -13,7 +13,7 @@ CFBundleIconFile Icon-57.png CFBundleIdentifier - org.cocos2dx.hellolua + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleVersion diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/mac/Info.plist b/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/mac/Info.plist index d5df83ea38..28a523359a 100644 --- a/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/mac/Info.plist +++ b/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/mac/Info.plist @@ -9,7 +9,7 @@ CFBundleIconFile Icon CFBundleIdentifier - org.cocos2dx.hellolua + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/tests/cpp-tests/CMakeLists.txt b/tests/cpp-tests/CMakeLists.txt index eba8890d66..9d60aa7ac0 100644 --- a/tests/cpp-tests/CMakeLists.txt +++ b/tests/cpp-tests/CMakeLists.txt @@ -534,6 +534,7 @@ setup_cocos_app_config(${APP_NAME}) if(APPLE) set_target_properties(${APP_NAME} PROPERTIES RESOURCE "${APP_UI_RES}") set_xcode_property(${APP_NAME} INSTALL_PATH "\$(LOCAL_APPS_DIR)") + set_xcode_property(${APP_NAME} PRODUCT_BUNDLE_IDENTIFIER "org.adxe.cpp-tests") if(MACOSX) set_target_properties(${APP_NAME} PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/proj.mac/Info.plist") diff --git a/tests/cpp-tests/proj.ios/Info.plist b/tests/cpp-tests/proj.ios/Info.plist index 14bb2e6fea..0171598f6c 100644 --- a/tests/cpp-tests/proj.ios/Info.plist +++ b/tests/cpp-tests/proj.ios/Info.plist @@ -11,7 +11,7 @@ CFBundleIconFile Icon CFBundleIdentifier - org.cocos2dx.cpp_tests + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/tests/cpp-tests/proj.mac/Info.plist b/tests/cpp-tests/proj.mac/Info.plist index 0875be471c..8e5f027c06 100644 --- a/tests/cpp-tests/proj.mac/Info.plist +++ b/tests/cpp-tests/proj.mac/Info.plist @@ -11,7 +11,7 @@ CFBundleIconFile Icon CFBundleIdentifier - org.cocos2dx.cpp_tests + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/tests/fairygui-tests/CMakeLists.txt b/tests/fairygui-tests/CMakeLists.txt index 61032c13fb..93c6f0abf8 100644 --- a/tests/fairygui-tests/CMakeLists.txt +++ b/tests/fairygui-tests/CMakeLists.txt @@ -130,6 +130,7 @@ setup_cocos_app_config(${APP_NAME}) if(XCODE) set_target_properties(${APP_NAME} PROPERTIES RESOURCE "${APP_UI_RES}") set_xcode_property(${APP_NAME} INSTALL_PATH "\$(LOCAL_APPS_DIR)") + set_xcode_property(${APP_NAME} PRODUCT_BUNDLE_IDENTIFIER "org.adxe.fairygui-tests") if(MACOSX) set_target_properties(${APP_NAME} PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/proj.mac/Info.plist") diff --git a/tests/fairygui-tests/proj.ios/Info.plist b/tests/fairygui-tests/proj.ios/Info.plist index 5ae7b3c73c..f979cc849b 100644 --- a/tests/fairygui-tests/proj.ios/Info.plist +++ b/tests/fairygui-tests/proj.ios/Info.plist @@ -24,7 +24,7 @@ CFBundleIcons~ipad CFBundleIdentifier - org.cocos2dx.fairygui_tests + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/tests/fairygui-tests/proj.mac/Info.plist b/tests/fairygui-tests/proj.mac/Info.plist index e62529864c..6feb2a81a1 100644 --- a/tests/fairygui-tests/proj.mac/Info.plist +++ b/tests/fairygui-tests/proj.mac/Info.plist @@ -9,7 +9,7 @@ CFBundleIconFile Icon CFBundleIdentifier - org.cocos2dx.fairygui_tests + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/tests/lua-tests/project/CMakeLists.txt b/tests/lua-tests/project/CMakeLists.txt index cc485b0c10..c71e10046a 100644 --- a/tests/lua-tests/project/CMakeLists.txt +++ b/tests/lua-tests/project/CMakeLists.txt @@ -126,6 +126,7 @@ setup_cocos_app_config(${APP_NAME}) if(APPLE) set_target_properties(${APP_NAME} PROPERTIES RESOURCE "${APP_UI_RES}") set_xcode_property(${APP_NAME} INSTALL_PATH "\$(LOCAL_APPS_DIR)") + set_xcode_property(${APP_NAME} PRODUCT_BUNDLE_IDENTIFIER "org.adxe.lua-tests") if(MACOSX) set_target_properties(${APP_NAME} PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/proj.ios_mac/mac/Info.plist") diff --git a/tests/lua-tests/project/proj.ios_mac/mac/Info.plist b/tests/lua-tests/project/proj.ios_mac/mac/Info.plist index 7312cbf7f1..f2921beab3 100644 --- a/tests/lua-tests/project/proj.ios_mac/mac/Info.plist +++ b/tests/lua-tests/project/proj.ios_mac/mac/Info.plist @@ -11,7 +11,7 @@ CFBundleIconFile Icon CFBundleIdentifier - org.cocos2dx.lua_tests + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName