提交 26e9ab47 编写于 作者: L Liu Yiqun

Fix if-statement error in CMakeLists.txt and remove build_ios task from travis.

上级 46ee8cee
...@@ -4,7 +4,6 @@ cache: ...@@ -4,7 +4,6 @@ cache:
- $HOME/.ccache - $HOME/.ccache
- $HOME/.cache/pip - $HOME/.cache/pip
- $TRAVIS_BUILD_DIR/build/third_party - $TRAVIS_BUILD_DIR/build/third_party
- $TRAVIS_BUILD_DIR/build_ios/third_party
sudo: required sudo: required
dist: trusty dist: trusty
os: os:
...@@ -12,12 +11,6 @@ os: ...@@ -12,12 +11,6 @@ os:
env: env:
- JOB=build_doc - JOB=build_doc
- JOB=check_style - JOB=check_style
matrix:
include:
- env: JOB=build_ios
os: osx
osx_image: xcode8.3
compiler: clang
addons: addons:
apt: apt:
packages: packages:
......
...@@ -65,12 +65,14 @@ if(NOT CMAKE_BUILD_TYPE) ...@@ -65,12 +65,14 @@ if(NOT CMAKE_BUILD_TYPE)
endif() endif()
if(ANDROID OR IOS) if(ANDROID OR IOS)
if(ANDROID AND ${CMAKE_SYSTEM_VERSION} VERSION_LESS "16") if(ANDROID)
if(AND ${CMAKE_SYSTEM_VERSION} VERSION_LESS "16")
message(FATAL_ERROR "Unsupport standalone toolchains with Android API level lower than 16") message(FATAL_ERROR "Unsupport standalone toolchains with Android API level lower than 16")
elseif(${CMAKE_SYSTEM_VERSION} VERSION_LESS "21") elseif(${CMAKE_SYSTEM_VERSION} VERSION_LESS "21")
# TODO: support glog for Android api 16 ~ 19 in the future # TODO: support glog for Android api 16 ~ 19 in the future
message(WARNING "Using the unofficial git repository <https://github.com/Xreki/glog.git> instead") message(WARNING "Using the unofficial git repository <https://github.com/Xreki/glog.git> instead")
endif() endif()
endif()
set(WITH_GPU OFF CACHE STRING set(WITH_GPU OFF CACHE STRING
"Disable GPU when cross-compiling for Android and iOS" FORCE) "Disable GPU when cross-compiling for Android and iOS" FORCE)
......
...@@ -17,4 +17,4 @@ cmake -DCMAKE_SYSTEM_NAME=iOS \ ...@@ -17,4 +17,4 @@ cmake -DCMAKE_SYSTEM_NAME=iOS \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
.. ..
make make -j 2
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册