Skip to content

Commit 4d0e76b

Browse files
crazyhappygameminggo
authored andcommitted
ios_cmake_3_14 (#20055)
* ios_cmake_3_14 * disabled ios_cmake * Update .travis.yml change to xcode11
1 parent f880350 commit 4d0e76b

File tree

2 files changed

+14
-5
lines changed

2 files changed

+14
-5
lines changed

.travis.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ matrix:
1818
osx_image: xcode9.3
1919
sudo: required
2020
# iOS_cmake
21-
# - os: osx
22-
# env: BUILD_TARGET=ios_cmake
23-
# language: cpp
24-
# osx_image: xcode9.3
25-
# sudo: required
21+
- os: osx
22+
env: BUILD_TARGET=ios_cmake
23+
language: cpp
24+
osx_image: xcode11
25+
sudo: required
2626
# android cmake
2727
- os: linux
2828
env: BUILD_TARGET=android_cmake

tools/travis-scripts/before-install.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,13 @@ function install_latest_python()
5050
python -V
5151
}
5252

53+
function install_cmake_osx()
54+
{
55+
cmake --version
56+
brew upgrade cmake
57+
cmake --version
58+
}
59+
5360
# set up environment according os and target
5461
function install_environement_for_pull_request()
5562
{
@@ -67,6 +74,7 @@ function install_environement_for_pull_request()
6774
if [ "$TRAVIS_OS_NAME" == "osx" ]; then
6875
install_latest_python
6976
install_python_module_for_osx
77+
install_cmake_osx
7078
fi
7179

7280
# use NDK's clang to generate binding codes
@@ -80,6 +88,7 @@ function install_environement_for_after_merge()
8088
if [ "$TRAVIS_OS_NAME" == "osx" ]; then
8189
install_latest_python
8290
install_python_module_for_osx
91+
install_cmake_osx
8392
fi
8493

8594
echo "Building merge commit ..."

0 commit comments

Comments
 (0)