diff --git a/.travis.yml b/.travis.yml index cc2036df5ace1a1df6f1b0b3f819fb3642ad5337..14a39c58ded6cddeb8b427e9fe07e10d8a0f5bd9 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 ab111eccc09b1678ccb40152c2c953cb17a0cefa..854066fd1d205c337fbdbe08997d88251095c799 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 0002a470d90f722e3f9106ca56d70e6bf2cea339..f9e05af59fed7a8ad049390eda2c94d8577db1e7 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})