Travis fix, simplifying appveyor.

lnlab · May 6, 2018 · c373db3 · c373db3
1 parent e0ba334
commit c373db3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -69,6 +69,10 @@ script:
   - 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
   - wget https://www.dropbox.com/s/2t5t1sdpshzfhpj/cen_patches_1.00_of.dat?dl=1
+  - mv cen_patches_0.25_of.dat?dl=1 cen_patches_0.25_of.dat
+  - mv cen_patches_0.35_of.dat?dl=1 cen_patches_0.35_of.dat
+  - 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 ../../../../
   - mkdir build

diff --git a/appveyor.yml b/appveyor.yml
@@ -35,8 +35,7 @@ test_script:
   - cmd: if exist Debug (cd Debug)
   - cmd: if exist Release (cd Release)
   - cmd: dir
-  - cmd: if exist "../samples" (FaceLandmarkImg.exe -fdir "../samples/" -out_dir "./demo_img/" -q) else (FaceLandmarkImg.exe -fdir "../../samples/" -out_dir "./demo_img/" -q)
-  - cmd: if exist "../samples" (FaceLandmarkImg.exe -inroot ../samples -f sample1.jpg -out_dir out_data -of sample1.pts -q) else (FaceLandmarkImg.exe -inroot ../../samples -f sample1.jpg -out_dir out_data -q)
+  - cmd: if exist "../samples" (FaceLandmarkImg.exe -inroot ../samples -f sample1.jpg -out_dir out_data -q) else (FaceLandmarkImg.exe -inroot ../../samples -f sample1.jpg -out_dir out_data -q)
   - cmd: if exist "../samples" (FaceLandmarkVidMulti.exe -inroot ../samples -f multi_face.avi -q) else (FaceLandmarkVidMulti.exe -inroot ../../samples -f multi_face.avi -q)
   - cmd: if exist "../samples" (FeatureExtraction.exe -f "../samples/default.wmv" -q) else (FeatureExtraction.exe -f "../../samples/default.wmv" -q)
   - cmd: if exist "../samples" (FeatureExtraction.exe -f "../samples/default.wmv" -simsize 200 -simscale 0.5 -q) else (FeatureExtraction.exe -f "../../samples/default.wmv" -simsize 200 -simscale 0.5 -ov feat_track.avi -q)

diff --git a/lib/3rdParty/dlib/include/dlib/matrix/matrix_trsm.h b/lib/3rdParty/dlib/include/dlib/matrix/matrix_trsm.h
@@ -9,7 +9,7 @@ namespace dlib
 {
     namespace blas_bindings
     {
-
+	#ifdef DLIB_USE_BLAS
 	#ifndef CBLAS_H
         extern "C"
         {
@@ -28,7 +28,7 @@ namespace dlib
 
     // ------------------------------------------------------------------------------------
 	#endif // if not CBLAS_H
-
+	#endif // if DLIB_USE_BLAS
 /*  Purpose */
 /*  ======= */