From 98ab6d23b65436e808aa9b82e86cd0e79910f6a6 Mon Sep 17 00:00:00 2001 From: minggo Date: Fri, 8 Nov 2019 10:30:51 +0800 Subject: [PATCH] set iOS default deployment version in correct place (#20307) --- templates/cpp-template-default/CMakeLists.txt | 4 ++-- tests/lua-empty-test/project/CMakeLists.txt | 4 ++-- tests/lua-tests/project/CMakeLists.txt | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/templates/cpp-template-default/CMakeLists.txt b/templates/cpp-template-default/CMakeLists.txt index e842335e8f..855de970b3 100644 --- a/templates/cpp-template-default/CMakeLists.txt +++ b/templates/cpp-template-default/CMakeLists.txt @@ -27,14 +27,14 @@ cmake_minimum_required(VERSION 3.6) set(APP_NAME HelloCpp) +project(${APP_NAME}) + if(XCODE) if(NOT DEFINED CMAKE_XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET) SET (CMAKE_XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET 8.0) endif() endif() -project(${APP_NAME}) - if(NOT DEFINED BUILD_ENGINE_DONE) # to test HelloCpp into root project set(COCOS2DX_ROOT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cocos2d) set(CMAKE_MODULE_PATH ${COCOS2DX_ROOT_PATH}/cmake/Modules/) diff --git a/tests/lua-empty-test/project/CMakeLists.txt b/tests/lua-empty-test/project/CMakeLists.txt index 88cb012549..549178f185 100644 --- a/tests/lua-empty-test/project/CMakeLists.txt +++ b/tests/lua-empty-test/project/CMakeLists.txt @@ -2,14 +2,14 @@ cmake_minimum_required(VERSION 3.6) set(APP_NAME lua-empty-test) +project(${APP_NAME}) + if(XCODE) if(NOT DEFINED CMAKE_XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET) SET (CMAKE_XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET 8.0) endif() endif() -project(${APP_NAME}) - if(NOT DEFINED BUILD_ENGINE_DONE) set(COCOS2DX_ROOT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../..) set(CMAKE_MODULE_PATH ${COCOS2DX_ROOT_PATH}/cmake/Modules/) diff --git a/tests/lua-tests/project/CMakeLists.txt b/tests/lua-tests/project/CMakeLists.txt index 15ebecd0bd..d74fc2b35b 100644 --- a/tests/lua-tests/project/CMakeLists.txt +++ b/tests/lua-tests/project/CMakeLists.txt @@ -2,14 +2,14 @@ cmake_minimum_required(VERSION 3.6) set(APP_NAME lua-tests) +project(${APP_NAME}) + if(XCODE) if(NOT DEFINED CMAKE_XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET) SET (CMAKE_XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET 8.0) endif() endif() -project(${APP_NAME}) - if(NOT DEFINED BUILD_ENGINE_DONE) set(COCOS2DX_ROOT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../..) set(CMAKE_MODULE_PATH ${COCOS2DX_ROOT_PATH}/cmake/Modules/)