From a69efc502e5486b6a0c0bb39bcd22963baf11e9a Mon Sep 17 00:00:00 2001 From: Tadas Baltrusaitis Date: Sun, 6 May 2018 14:01:08 +0100 Subject: [PATCH] Another attempt at a travis fix --- .travis.yml | 4 ++-- lib/3rdParty/dlib/include/dlib/matrix/matrix_trsm.h | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index a538e3fa..b9b1f159 100644 --- a/.travis.yml +++ b/.travis.yml @@ -64,7 +64,7 @@ before_install: script: - $CXX --version - - cd lib/local/LandmarkDetector/model + - cd lib/local/LandmarkDetector/model/patch_experts - wget https://www.dropbox.com/s/7na5qsjzz8yfoer/cen_patches_0.25_of.dat?dl=1 - wget https://www.dropbox.com/s/k7bj804cyiu474t/cen_patches_0.35_of.dat?dl=1 - wget https://www.dropbox.com/s/ixt4vkbmxgab1iu/cen_patches_0.50_of.dat?dl=1 @@ -74,7 +74,7 @@ script: - mv cen_patches_0.50_of.dat?dl=1 cen_patches_0.50_of.dat - mv cen_patches_1.00_of.dat?dl=1 cen_patches_1.00_of.dat - ls - - cd ../../../../ + - cd ../../../../../ - mkdir build - cd build - cmake -D CMAKE_BUILD_TYPE=RELEASE CMAKE_CXX_FLAGS="-std=c++11" -D CMAKE_EXE_LINKER_FLAGS="-std=c++11" .. diff --git a/lib/3rdParty/dlib/include/dlib/matrix/matrix_trsm.h b/lib/3rdParty/dlib/include/dlib/matrix/matrix_trsm.h index 358ccadc..25fe70a6 100644 --- a/lib/3rdParty/dlib/include/dlib/matrix/matrix_trsm.h +++ b/lib/3rdParty/dlib/include/dlib/matrix/matrix_trsm.h @@ -9,6 +9,7 @@ namespace dlib { namespace blas_bindings { + #ifndef __VECLIB__ #ifdef DLIB_USE_BLAS #ifndef CBLAS_H extern "C" @@ -29,6 +30,7 @@ namespace dlib // ------------------------------------------------------------------------------------ #endif // if not CBLAS_H #endif // if DLIB_USE_BLAS + #endif // if __VECLIB__ /* Purpose */ /* ======= */