From a98c9e6bbf27dba8377d4f709bfc0aa2e71b8148 Mon Sep 17 00:00:00 2001 From: Liu Yiqun Date: Mon, 4 Sep 2017 13:25:00 +0800 Subject: [PATCH] Add third_party_android back to the cache directories to speedup travis. --- .travis.yml | 1 + cmake/cblas.cmake | 4 ---- cmake/external/openblas.cmake | 4 ++++ 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index cc2036df5ac..14a39c58ded 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,7 @@ cache: - $HOME/.ccache - $HOME/.cache/pip - $TRAVIS_BUILD_DIR/build/third_party + - $TRAVIS_BUILD_DIR/build/third_party_android sudo: required dist: trusty os: diff --git a/cmake/cblas.cmake b/cmake/cblas.cmake index ab111eccc09..854066fd1d2 100644 --- a/cmake/cblas.cmake +++ b/cmake/cblas.cmake @@ -13,10 +13,6 @@ # system paths. # -if(USE_EIGEN_FOR_BLAS) - return() -endif(USE_EIGEN_FOR_BLAS) - set(CBLAS_FOUND OFF) ## Find MKLML First. diff --git a/cmake/external/openblas.cmake b/cmake/external/openblas.cmake index 0002a470d90..f9e05af59fe 100644 --- a/cmake/external/openblas.cmake +++ b/cmake/external/openblas.cmake @@ -12,6 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. +IF(USE_EIGEN_FOR_BLAS) + return() +ENDIF(USE_EIGEN_FOR_BLAS) + INCLUDE(cblas) IF(NOT ${CBLAS_FOUND}) -- GitLab