cmake: Compile CUDA version without intermediate kcfcuda library

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index eb576a7677e25f43d92b95f0ac322409aadba03d..0f734a08052aa6314631a8e960c60d7e8229aa0a 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -40,7 +40,7 @@ ELSEIF(FFT STREQUAL "cuFFTW")
   add_definitions(-DFFTW -DCUFFTW)
   set(use_cuda ON)
 ELSEIF(FFT STREQUAL "cuFFT")
-    list(APPEND KCF_LIB_SRC fft_cufft.cpp complexmat.cuh cuda_functions.cuh)
+    list(APPEND KCF_LIB_SRC fft_cufft.cpp complexmat.cuh cuda_functions.cuh complexmat.cu cuda_functions.cu)
     add_definitions(-DCUFFT)
     set(use_cuda ON)
     iF(CUDA_DEBUG)
@@ -85,16 +85,17 @@ IF(use_cuda)
   CUDA_SELECT_NVCC_ARCH_FLAGS(ARCH_FLAGS ${CUDA_ARCH_LIST})
   list( APPEND CUDA_NVCC_FLAGS -O3 -std=c++11 ${ARCH_FLAGS} --default-stream per-thread) # --gpu-architecture sm_62 )
   find_cuda_helper_libs(cufftw)
-  IF(FFT STREQUAL "cuFFT")
-    cuda_add_library(kcfcuda complexmat.cu cuda_functions.cu)
-  ENDIF()
-
 ENDIF()
 
 add_subdirectory(piotr_fhog)
 add_subdirectory(cn)
 
-add_library(kcf STATIC ${KCF_LIB_SRC})
+if(FFT STREQUAL "cuFFT")
+  cuda_add_library(kcf STATIC ${KCF_LIB_SRC})
+else()
+  add_library(kcf STATIC ${KCF_LIB_SRC})
+endif()
+
 if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
   target_compile_options(kcf PRIVATE -Wno-gnu-zero-variadic-macro-arguments)
 endif()
@@ -117,7 +118,7 @@ IF(FFT STREQUAL "cuFFTW")
 ENDIF() #cuFFTW
 
 IF(FFT STREQUAL "cuFFT")
-    target_link_libraries(kcf kcfcuda ${CUDA_cufft_LIBRARY} ${CUDA_cublas_LIBRARY} ${CUDA_LIBRARIES})
+    target_link_libraries(kcf ${CUDA_cufft_LIBRARY} ${CUDA_cublas_LIBRARY} ${CUDA_LIBRARIES})
 ENDIF()
 
 IF(PROFILING)