Moved omp pragmas declaration to seperate file

[hercules2020/kcf.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bb31ccbaf428d8bfaa07c839fbb8689a17267e5e..4bdff1c7e8693129989b963369cafc8d8f81ae81 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,11 +1,11 @@
 cmake_minimum_required(VERSION 2.8)
 
-set(KCF_LIB_SRC kcf.cpp kcf.h fft.cpp)
+set(KCF_LIB_SRC kcf.cpp kcf.h fft.cpp scale_vars.hpp pragmas.h)
 
 find_package(PkgConfig)
 
 SET(FFT "OpenCV" CACHE STRING "Select FFT implementation")
-SET_PROPERTY(CACHE FFT PROPERTY STRINGS OpenCV OpenCV_cuFFT fftw cuFFTW cuFFT)
+SET_PROPERTY(CACHE FFT PROPERTY STRINGS OpenCV fftw cuFFTW cuFFT)
 MESSAGE(STATUS "FFT implementation: ${FFT}")
 
 option(OPENMP "Use OpenMP library. Works with FFTW and OpenCV implementation." OFF)
@@ -33,10 +33,6 @@ SET(use_cuda OFF)
 
 IF(FFT STREQUAL "OpenCV")
   list(APPEND KCF_LIB_SRC fft_opencv.cpp complexmat.hpp)
-ELSEIF(FFT STREQUAL "OpenCV_cuFFT")
-  list(APPEND KCF_LIB_SRC fft_opencv_cuda.cpp complexmat.hpp)
-  add_definitions(-DOPENCV_CUFFT)
-  set(use_cuda ON)
 ELSEIF(FFT STREQUAL "fftw")
   list(APPEND KCF_LIB_SRC fft_fftw.cpp complexmat.hpp)
   add_definitions(-DFFTW)
@@ -65,9 +61,12 @@ IF((FFT STREQUAL "cuFFT") AND (ASYNC))
   message(SEND_ERROR "cuFFT version does not support ASYNC and OpenMP only if used with big batch mode.")
 ENDIF()
 
-IF(ASYNC AND NOT OPENMP)
+IF(ASYNC)
   add_definitions(-DASYNC)
   MESSAGE(STATUS "ASYNC")
+ELSEIF(OPENMP)
+    add_definitions(-DOPENMP)
+    MESSAGE(STATUS "OPENMP")
 ENDIF() #ASYNC
 
 FIND_PACKAGE( OpenCV REQUIRED )
@@ -83,7 +82,7 @@ IF(use_cuda)
   set(CUDA_SEPARABLE_COMPILATION ON)
   set(CUDA_PROPAGATE_HOST_FLAGS OFF)
   set(CUDA_HOST_COMPILER /usr/bin/g++)
-  list( APPEND CUDA_NVCC_FLAGS -O3 --gpu-architecture sm_62 -std=c++11 -default-stream per-thread)
+  list( APPEND CUDA_NVCC_FLAGS -O3 --gpu-architecture sm_62 -std=c++11)
   find_cuda_helper_libs(cufftw)
   IF(FFT STREQUAL "cuFFT")
   add_subdirectory(cuda)