Additional ENABLE_DYNAMIC_CUDA option implemented in cmake. Warning fixes and refactoring.

CMakeLists.txt

@@ -201,6 +201,7 @@ OCV_OPTION(INSTALL_TO_MANGLED_PATHS "Enables mangled install paths, that help wi
 
 # OpenCV build options
 # ===================================================
+OCV_OPTION(ENABLE_DYNAMIC_CUDA        "Enabled dynamic CUDA linkage"                             ON   IF ANDROID OR LINUX)
 OCV_OPTION(ENABLE_PRECOMPILED_HEADERS "Use precompiled headers"                                  ON   IF (NOT IOS) )
 OCV_OPTION(ENABLE_SOLUTION_FOLDERS    "Solution folder in Visual Studio or in other IDEs"        (MSVC_IDE OR CMAKE_GENERATOR MATCHES Xcode) IF (CMAKE_VERSION VERSION_GREATER "2.8.0") )
 OCV_OPTION(ENABLE_PROFILING           "Enable profiling in the GCC compiler (Add flags: -g -pg)" OFF  IF CMAKE_COMPILER_IS_GNUCXX )

modules/core/CMakeLists.txt

@@ -1,8 +1,12 @@
 set(the_description "The Core Functionality")
 
-if (HAVE_opencv_dynamicuda)
+message(STATUS "ENABLE_DYNAMIC_CUDA ${ENABLE_DYNAMIC_CUDA}")
+
+if (ENABLE_DYNAMIC_CUDA)
+  message(STATUS "Using dynamic cuda approach")
   ocv_add_module(core PRIVATE_REQUIRED ${ZLIB_LIBRARIES})
 else()
+  message(STATUS "Link CUDA statically")
   ocv_add_module(core PRIVATE_REQUIRED ${ZLIB_LIBRARIES} ${CUDA_LIBRARIES} ${CUDA_npp_LIBRARY})
 endif()
 
@@ -12,7 +16,7 @@ if(HAVE_WINRT)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /ZW /GS /Gm- /AI\"${WINDOWS_SDK_PATH}/References/CommonConfiguration/Neutral\" /AI\"${VISUAL_STUDIO_PATH}/vcpackages\"")
 endif()
 
-if(HAVE_opencv_dynamicuda)
+if(ENABLE_DYNAMIC_CUDA)
   add_definitions(-DDYNAMIC_CUDA_SUPPORT)
 else()
   add_definitions(-DUSE_CUDA)
@@ -26,18 +30,18 @@ endif()
 file(GLOB lib_cuda_hdrs        "include/opencv2/${name}/cuda/*.hpp"        "include/opencv2/${name}/cuda/*.h")
 file(GLOB lib_cuda_hdrs_detail "include/opencv2/${name}/cuda/detail/*.hpp" "include/opencv2/${name}/cuda/detail/*.h")
 
-if (NOT HAVE_opencv_dynamicuda)
+if (NOT ENABLE_DYNAMIC_CUDA)
   file(GLOB lib_cuda               "../dynamicuda/src/cuda/*.cu*")
 endif()
 
 source_group("Cuda Headers"         FILES ${lib_cuda_hdrs})
 source_group("Cuda Headers\\Detail" FILES ${lib_cuda_hdrs_detail})
 
-if (NOT HAVE_opencv_dynamicuda)
+if (NOT ENABLE_DYNAMIC_CUDA)
   source_group("Src\\Cuda"      FILES ${lib_cuda} ${lib_cuda_hdrs})
 endif()
 
-if (HAVE_opencv_dynamicuda)
+if (ENABLE_DYNAMIC_CUDA)
   ocv_glob_module_sources(SOURCES "${opencv_core_BINARY_DIR}/version_string.inc"
                           HEADERS ${lib_cuda_hdrs} ${lib_cuda_hdrs_detail})
 else()

modules/dynamicuda/CMakeLists.txt

@@ -5,6 +5,7 @@ endif()
 set(the_description "Dynamic CUDA linkage")
 
 add_definitions(-DUSE_CUDA)
+ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef)
 ocv_module_include_directories("${OpenCV_SOURCE_DIR}/modules/gpu/include")
 set(OPENCV_MODULE_TYPE SHARED)
 if (BUILD_FAT_JAVA_LIB)

modules/dynamicuda/src/main.cpp

@@ -39,6 +39,9 @@ static EmptyFuncTable gpuTable;
 
 extern "C" {
 
+DeviceInfoFuncTable* deviceInfoFactory();
+GpuFuncTable* gpuFactory();
+
 DeviceInfoFuncTable* deviceInfoFactory()
 {
     return (DeviceInfoFuncTable*)&deviceInfoTable;

modules/java/CMakeLists.txt

@@ -297,7 +297,7 @@ if(BUILD_FAT_JAVA_LIB)
       list(REMOVE_ITEM __deps ${m})
     endif()
   endforeach()
-  if (HAVE_opencv_dynamicuda)
+  if (ENABLE_DYNAMIC_CUDA)
     list(REMOVE_ITEM __deps "opencv_dynamicuda")
   endif()
   if (ANDROID AND HAVE_opencv_gpu)