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

.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:

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 <https://github.com/Xreki/glog.git> 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 <https://github.com/Xreki/glog.git> instead")
+        endif()
     endif()
 
     set(WITH_GPU OFF CACHE STRING

paddle/scripts/travis/build_ios.sh

@@ -17,4 +17,4 @@ cmake -DCMAKE_SYSTEM_NAME=iOS \
       -DCMAKE_BUILD_TYPE=Release \
       ..
 
-make
+make -j 2