Minor cmake cuda refactor

.gitignore

 */build
-*/node_modules
+**/node_modules
 **/include/ftl/config.h
 **/src/config.cpp
 **/*.blend1

CMakeLists.txt

@@ -19,14 +19,20 @@ find_package( URIParser REQUIRED )
 find_package( MsgPack REQUIRED )
 find_package( LibSGM )
 
+# Why is this problematic on some machines?
 check_language(CUDA)
 if (CUDA_TOOLKIT_ROOT_DIR)
 enable_language(CUDA)
 set(CMAKE_CUDA_FLAGS "")
 set(CMAKE_CUDA_FLAGS_DEBUG "-g -DDEBUG -D_DEBUG -Wall")
 set(CMAKE_CUDA_FLAGS_RELEASE "")
-add_definitions(-DHAVE_CUDA)
+set(HAVE_CUDA TRUE)
 include_directories(${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES})
+
+set_property(TARGET Threads::Threads
+                 PROPERTY INTERFACE_COMPILE_OPTIONS $<$<COMPILE_LANGUAGE:CUDA>:-Xcompiler -pthread>
+                                                    "$<$<NOT:$<COMPILE_LANGUAGE:CUDA>>:-pthread>")
+
 endif ()
 
 if (NOT MsgPack_FOUND)

common/cpp/include/ftl/config.h.in

@@ -4,6 +4,7 @@
 #cmakedefine HAVE_VIZ
 #cmakedefine HAVE_OPENCVCUDA
 #cmakedefine HAVE_URIPARSESINGLE
+#cmakedefine HAVE_CUDA
 
 extern const char *FTL_VERSION_LONG;
 extern const char *FTL_VERSION;

cv-node/CMakeLists.txt

@@ -43,14 +43,10 @@ add_executable(cv-node ${CVNODESRC})
 add_dependencies(cv-node net)
 
 if (CUDA_FOUND)
-set_property(TARGET Threads::Threads
-                 PROPERTY INTERFACE_COMPILE_OPTIONS $<$<COMPILE_LANGUAGE:CUDA>:-Xcompiler -pthread>
-                                                    "$<$<NOT:$<COMPILE_LANGUAGE:CUDA>>:-pthread>")
-
 set_property(TARGET cv-node PROPERTY CUDA_SEPARABLE_COMPILATION ON)
-endif (CUDA_FOUND)
+endif()
 
-target_include_directories(cv-node PUBLIC ${PROJECT_SOURCE_DIR}/include)
-target_link_libraries(cv-node Threads::Threads ${OpenCV_LIBS} ${LIBSGM_LIBRARIES} ${CUDA_LIBRARIES} ${GLOG_LIBRARIES})
+#target_include_directories(cv-node PUBLIC ${PROJECT_SOURCE_DIR}/include)
+target_link_libraries(cv-node net Threads::Threads ${OpenCV_LIBS} ${LIBSGM_LIBRARIES} ${CUDA_LIBRARIES} ${GLOG_LIBRARIES})
 
 

cv-node/include/ftl/cuda_common.hpp

 #ifndef _FTL_CUDA_COMMON_HPP_
 #define _FTL_CUDA_COMMON_HPP_
 
+#include <ftl/config.h>
+
 #if defined HAVE_CUDA
 
 #include <opencv2/core/cuda.hpp>