diff --git a/.travis.yml b/.travis.yml index 0a8edb42b40e4f8f12e79d04e600ec8aff0d7193..d0e2696f100e55f320e410afd6a3038db647f76f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,6 @@ cache: - $HOME/.ccache - $HOME/.cache/pip - $TRAVIS_BUILD_DIR/build/third_party - - $TRAVIS_BUILD_DIR/build_ios/third_party sudo: required dist: trusty os: @@ -12,12 +11,6 @@ os: env: - JOB=build_doc - JOB=check_style -matrix: - include: - - env: JOB=build_ios - os: osx - osx_image: xcode8.3 - compiler: clang addons: apt: packages: diff --git a/CMakeLists.txt b/CMakeLists.txt index e64e666985fff3ed59ccf733f39c490a235efd26..4b564b48265897d8b412603baf181030e2b00f82 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -65,11 +65,13 @@ if(NOT CMAKE_BUILD_TYPE) endif() if(ANDROID OR IOS) - if(ANDROID AND ${CMAKE_SYSTEM_VERSION} VERSION_LESS "16") - message(FATAL_ERROR "Unsupport standalone toolchains with Android API level lower than 16") - elseif(${CMAKE_SYSTEM_VERSION} VERSION_LESS "21") - # TODO: support glog for Android api 16 ~ 19 in the future - message(WARNING "Using the unofficial git repository instead") + if(ANDROID) + if(AND ${CMAKE_SYSTEM_VERSION} VERSION_LESS "16") + message(FATAL_ERROR "Unsupport standalone toolchains with Android API level lower than 16") + elseif(${CMAKE_SYSTEM_VERSION} VERSION_LESS "21") + # TODO: support glog for Android api 16 ~ 19 in the future + message(WARNING "Using the unofficial git repository instead") + endif() endif() set(WITH_GPU OFF CACHE STRING diff --git a/paddle/scripts/travis/build_ios.sh b/paddle/scripts/travis/build_ios.sh index 3568b5ebcb9989b904fb75c12c79a6bde42101db..dee7cf7cbbcccffd727002108ae7f6b6ee2fbba8 100755 --- a/paddle/scripts/travis/build_ios.sh +++ b/paddle/scripts/travis/build_ios.sh @@ -17,4 +17,4 @@ cmake -DCMAKE_SYSTEM_NAME=iOS \ -DCMAKE_BUILD_TYPE=Release \ .. -make +make -j 2