From e564e12f3a8eadf5aaa3dec352da7a7d5b4f5c63 Mon Sep 17 00:00:00 2001 From: Arnold <40414978+PatriceJiang@users.noreply.github.com> Date: Tue, 10 Dec 2019 13:41:44 +0800 Subject: [PATCH] [bugfix] set Info.plist path (#20405) fix bug introduced in #20205 --- templates/cpp-template-default/CMakeLists.txt | 4 ++-- templates/cpp-template-default/proj.ios_mac/ios/Info.plist | 2 +- templates/lua-template-default/CMakeLists.txt | 2 +- .../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 | 4 ++-- tests/cpp-tests/proj.ios/Info.plist | 2 +- tests/cpp-tests/proj.mac/Info.plist | 2 +- tests/lua-tests/project/CMakeLists.txt | 4 ++-- tests/lua-tests/project/proj.ios_mac/ios/Info.plist | 2 +- tests/lua-tests/project/proj.ios_mac/mac/Info.plist | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) diff --git a/templates/cpp-template-default/CMakeLists.txt b/templates/cpp-template-default/CMakeLists.txt index 0c79fb92dd..a48047874f 100644 --- a/templates/cpp-template-default/CMakeLists.txt +++ b/templates/cpp-template-default/CMakeLists.txt @@ -141,9 +141,9 @@ if(APPLE) set_target_properties(${APP_NAME} PROPERTIES RESOURCE "${APP_UI_RES}") if(MACOSX) - set_xcode_property(${APP_NAME} INFOPLIST_FILE "${CMAKE_CURRENT_SOURCE_DIR}/proj.ios_mac/mac/Info.plist") + set_target_properties(${APP_NAME} PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/proj.ios_mac/mac/Info.plist") elseif(IOS) - set_xcode_property(${APP_NAME} INFOPLIST_FILE "${CMAKE_CURRENT_SOURCE_DIR}/proj.ios_mac/ios/Info.plist") + set_target_properties(${APP_NAME} PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/proj.ios_mac/ios/Info.plist") set_xcode_property(${APP_NAME} ASSETCATALOG_COMPILER_APPICON_NAME "AppIcon") endif() 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 739c1700a8..a0dcf58700 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.${PRODUCT_NAME} + org.cocos2dx.hellocpp CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/templates/lua-template-default/CMakeLists.txt b/templates/lua-template-default/CMakeLists.txt index 2680a6196d..74cf31491d 100644 --- a/templates/lua-template-default/CMakeLists.txt +++ b/templates/lua-template-default/CMakeLists.txt @@ -136,7 +136,7 @@ if(APPLE) LINK_FLAGS "-pagezero_size 10000 -image_base 100000000" ) elseif(IOS) - set_xcode_property(${APP_NAME} INFOPLIST_FILE "${RUNTIME_SRC_ROOT}/proj.ios_mac/ios/Info.plist") + set_target_properties(${APP_NAME} PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${RUNTIME_SRC_ROOT}/proj.ios_mac/ios/Info.plist") set_xcode_property(${APP_NAME} ASSETCATALOG_COMPILER_APPICON_NAME "AppIcon") set_xcode_property(${APP_NAME} DEVELOPMENT_TEAM "") set_xcode_property(${APP_NAME} CODE_SIGN_IDENTITY "iPhone Developer") 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 01667c8d0a..88a6ffefc1 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 @@ -11,7 +11,7 @@ CFBundleIconFile Icon-57.png CFBundleIdentifier - org.cocos2dx.${PRODUCT_NAME} + org.cocos2dx.hellolua 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 7251aefce9..a80a4a07ba 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.${PRODUCT_NAME} + org.cocos2dx.hellolua CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/tests/cpp-tests/CMakeLists.txt b/tests/cpp-tests/CMakeLists.txt index e0379e570f..7a0d46020d 100644 --- a/tests/cpp-tests/CMakeLists.txt +++ b/tests/cpp-tests/CMakeLists.txt @@ -401,9 +401,9 @@ if(APPLE) set_target_properties(${APP_NAME} PROPERTIES RESOURCE "${APP_UI_RES}") if(MACOSX) - set_xcode_property(${APP_NAME} INFOPLIST_FILE "${CMAKE_CURRENT_SOURCE_DIR}/proj.mac/Info.plist") + set_target_properties(${APP_NAME} PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/proj.mac/Info.plist") elseif(IOS) - set_xcode_property(${APP_NAME} INFOPLIST_FILE "${CMAKE_CURRENT_SOURCE_DIR}/proj.ios/Info.plist") + set_target_properties(${APP_NAME} PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/proj.ios/Info.plist") set_xcode_property(${APP_NAME} ASSETCATALOG_COMPILER_APPICON_NAME "AppIcon-${APP_NAME}") endif() diff --git a/tests/cpp-tests/proj.ios/Info.plist b/tests/cpp-tests/proj.ios/Info.plist index b340e7d833..1666e58220 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.${PRODUCT_NAME} + org.cocos2dx.cpp_tests CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/tests/cpp-tests/proj.mac/Info.plist b/tests/cpp-tests/proj.mac/Info.plist index ea5cd6d7d0..a0f571baab 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.${PRODUCT_NAME} + org.cocos2dx.cpp_tests CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/tests/lua-tests/project/CMakeLists.txt b/tests/lua-tests/project/CMakeLists.txt index f0c8a4d455..761b4a45d9 100644 --- a/tests/lua-tests/project/CMakeLists.txt +++ b/tests/lua-tests/project/CMakeLists.txt @@ -120,12 +120,12 @@ if(APPLE) set_target_properties(${APP_NAME} PROPERTIES RESOURCE "${APP_UI_RES}") if(MACOSX) - set_xcode_property(${APP_NAME} INFOPLIST_FILE "${CMAKE_CURRENT_SOURCE_DIR}/proj.ios_mac/mac/Info.plist") + set_target_properties(${APP_NAME} PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/proj.ios_mac/mac/Info.plist") set_target_properties(${APP_NAME} PROPERTIES LINK_FLAGS "-pagezero_size 10000 -image_base 100000000" ) elseif(IOS) - set_xcode_property(${APP_NAME} INFOPLIST_FILE "${CMAKE_CURRENT_SOURCE_DIR}/proj.ios_mac/ios/Info.plist") + set_target_properties(${APP_NAME} PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/proj.ios_mac/ios/Info.plist") set_xcode_property(${APP_NAME} ASSETCATALOG_COMPILER_APPICON_NAME "AppIcon-${APP_NAME}") endif() diff --git a/tests/lua-tests/project/proj.ios_mac/ios/Info.plist b/tests/lua-tests/project/proj.ios_mac/ios/Info.plist index 8539e9cd36..35428cc6a3 100644 --- a/tests/lua-tests/project/proj.ios_mac/ios/Info.plist +++ b/tests/lua-tests/project/proj.ios_mac/ios/Info.plist @@ -22,7 +22,7 @@ CFBundleIcons~ipad CFBundleIdentifier - org.cocos2dx.$(PRODUCT_NAME) + org.cocos2dx.lua_tests CFBundleInfoDictionaryVersion 6.0 CFBundleName 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 13d0fefb77..c9425ef36a 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.${PRODUCT_NAME} + org.cocos2dx.lua_tests CFBundleInfoDictionaryVersion 6.0 CFBundleName