remove_ios.toolchain.cmake (#20058)

* remove_ios.toolchain.cmake

* simplify osx configuration

* Remove ios.toolchain.cmake

Author: crazyhappygame

.travis.yml

@@ -15,7 +15,7 @@ matrix:
     - os: osx
       env: BUILD_TARGET=mac_cmake
       language: cpp
-      osx_image: xcode9.3
+      osx_image: xcode10.3
       sudo: required
     # iOS_cmake
     - os: osx

cmake/Modules/CocosConfigDefine.cmake

@@ -1,34 +1,39 @@
+If(APPLE)
+    if(${CMAKE_VERSION} VERSION_LESS "3.14")
+        message(FATAL_ERROR "Please use CMake 3.14 or newer for Apple platform (macOS, iOS, tvOS or watchOS)")
+    endif()
+endif()
+
  #Please use them everywhere
  #WINDOWS   =   Windows Desktop
  #ANDROID    =  Android
  #IOS    =  iOS
  #MACOSX    =  MacOS X
  #LINUX      =   Linux
- if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
-     set(WINDOWS TRUE)
-     set(PLATFORM_FOLDER win32)
- elseif(${CMAKE_SYSTEM_NAME} MATCHES "Android")
-     set(PLATFORM_FOLDER android)
- elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-     if(ANDROID)
-         set(PLATFORM_FOLDER android)
-     else()
-         set(LINUX TRUE)
-         set(PLATFORM_FOLDER linux)
-     endif()
- elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-     if(IOS)
-         set(APPLE TRUE)
-         set(PLATFORM_FOLDER ios)
-     else()
-         set(APPLE TRUE)
-         set(MACOSX TRUE)
-         set(PLATFORM_FOLDER mac)
-     endif()
- else()
-     message(FATAL_ERROR "Unsupported platform, CMake will exit")
-     return()
- endif()
+if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+    set(WINDOWS TRUE)
+    set(PLATFORM_FOLDER win32)
+elseif(${CMAKE_SYSTEM_NAME} MATCHES "Android")
+    set(PLATFORM_FOLDER android)
+elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+    if(ANDROID)
+        set(PLATFORM_FOLDER android)
+    else()
+        set(LINUX TRUE)
+        set(PLATFORM_FOLDER linux)
+    endif()
+elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+    set(APPLE TRUE)
+    set(MACOSX TRUE)
+    set(PLATFORM_FOLDER mac)
+elseif(${CMAKE_SYSTEM_NAME} MATCHES "iOS")
+    set(APPLE TRUE)
+    set(IOS TRUE)
+    set(PLATFORM_FOLDER ios)
+else()
+    message(FATAL_ERROR "Unsupported platform, CMake will exit")
+    return()
+endif()
 
 # generators that are capable of organizing into a hierarchy of folders
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)

cmake/ios.toolchain.cmake

@@ -41,22 +41,6 @@ function install_python_module_for_osx()
     sudo pip install Cheetah
 }
 
-function install_latest_python()
-{
-    python -V
-    eval "$(pyenv init -)"
-    pyenv install 2.7.14
-    pyenv global 2.7.14
-    python -V
-}
-
-function install_cmake_osx()
-{
-    cmake --version
-    brew upgrade cmake
-    cmake --version
-}
-
 # set up environment according os and target
 function install_environement_for_pull_request()
 {
@@ -72,9 +56,7 @@ function install_environement_for_pull_request()
     fi
 
     if [ "$TRAVIS_OS_NAME" == "osx" ]; then
-        install_latest_python
         install_python_module_for_osx
-        install_cmake_osx
     fi
 
     # use NDK's clang to generate binding codes
@@ -86,16 +68,17 @@ function install_environement_for_pull_request()
 function install_environement_for_after_merge()
 {
     if [ "$TRAVIS_OS_NAME" == "osx" ]; then
-        install_latest_python
         install_python_module_for_osx
-        install_cmake_osx
     fi
 
     echo "Building merge commit ..."
     install_android_ndk
     download_deps
 }
 
+cmake --version
+python -V
+
 if [ "$BUILD_TARGET" == "android_cocos_new_test" ]; then
     sudo apt-get update
     sudo apt-get install ninja-build

tools/travis-scripts/before-install.sh

@@ -68,7 +68,7 @@ function build_ios_cmake()
     cd $COCOS2DX_ROOT
     mkdir -p ios_cmake_build
     cd ios_cmake_build
-    cmake .. -DCMAKE_TOOLCHAIN_FILE=$COCOS2DX_ROOT/cmake/ios.toolchain.cmake -GXcode -DIOS_PLATFORM=SIMULATOR64
+    cmake .. -GXcode -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_SYSROOT=iphonesimulator
     # too much logs on console when "cmake --build ."
     # cmake --build .
     xcodebuild -project Cocos2d-x.xcodeproj -alltargets -jobs $NUM_OF_CORES  -destination "platform=iOS Simulator,name=iPhone Retina (4-inch)" build  | xcpretty
@@ -112,11 +112,6 @@ function genernate_binding_codes()
         ldd $COCOS2DX_ROOT/tools/bindings-generator/libclang/libclang.so
     fi
 
-    if [ "$TRAVIS_OS_NAME" == "osx" ]; then
-        eval "$(pyenv init -)"
-    fi
-    which python
-
     source ../environment.sh
 
     # Generate binding glue codes