Simplify scale initialization

[hercules2020/kcf.git] / Makefile

diff --git a/Makefile b/Makefile
index 86c944e29e8fa7f4bbc8a6704377e6a41f61cabf..1b48220edae74d86b3c529a0117a30ec954d2009 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # Makefile to build all the available variants
 
 BUILDS = opencvfft-st opencvfft-async opencvfft-openmp fftw fftw-async fftw-openmp fftw-big fftw-big-openmp cufftw cufftw-big cufftw-big-openmp cufft cufft-openmp cufft-big cufft-big-openmp
-TESTSEQ = bag ball1 car1 book
+TESTSEQ = bmx ball1 crossing racing book
 TESTFLAGS = default fit128
 
 all: $(BUILDS)
@@ -19,8 +19,6 @@ $(BUILDS): build.ninja
 clean: build.ninja
        ninja $@
 
-CMAKE_OPTS += -G Ninja
-
 ## Useful setting - uncomment and modify as needed
 # CMAKE_OPTS += -DOpenCV_DIR=~/opt/opencv-2.4/share/OpenCV
 # CMAKE_OPTS += -DCUDA_VERBOSE_BUILD=ON -DCUDA_NVCC_FLAGS="--verbose;--save-temps"
@@ -109,7 +107,7 @@ rule REGENERATE
   description = Regenerating $$out
   generator = 1
 rule CMAKE
-  command = cd $$subdir && cmake $(CMAKE_OPTS) $$opts ..
+  command = cd $$subdir && cmake -G Ninja $(CMAKE_OPTS) $$opts ..
 rule NINJA
   # Absolute path in -C allows Emacs to properly jump to error message locations
   command = ninja -C $(CURDIR)/$$subdir