Merge branch '4.x' of github.com:kallaballa/opencv_contrib into 4.x

kallaballa · Jul 4, 2023 · b40e462 · b40e462
2 parents 54e3037 + 0be2485
commit b40e462
Showing 1 changed file with 5 additions and 23 deletions.
diff --git a/modules/v4d/CMakeLists.txt b/modules/v4d/CMakeLists.txt
@@ -9,24 +9,6 @@ endif()
 
 set(the_description "V4D Visualization Module")
 
-macro(configure_files srcDir destDir)
-    message(STATUS "Configuring directory ${destDir}")
-    make_directory(${destDir})
-
-    file(GLOB templateFiles RELATIVE ${srcDir} "${srcDir}/*")
-    foreach(templateFile ${templateFiles})
-        set(srcTemplatePath ${srcDir}/${templateFile})
-        if(NOT IS_DIRECTORY ${srcTemplatePath})
-            message(STATUS "Configuring file ${templateFile}")
-            configure_file(
-                    ${srcTemplatePath}
-                    ${destDir}/${templateFile}
-                    @ONLY)
-        endif(NOT IS_DIRECTORY ${srcTemplatePath})
-    endforeach(templateFile)
-endmacro(configure_files)
-
-
 macro(add_emscripten_sample sample source assets)
     ocv_add_executable(${sample} ${source})
     ocv_target_include_modules(${sample} opencv_core opencv_imgproc opencv_videoio opencv_video opencv_imgcodecs opencv_v4d opencv_face opencv_tracking opencv_objdetect opencv_stitching opencv_optflow opencv_imgcodecs opencv_features2d opencv_dnn  opencv_flann)
@@ -46,9 +28,9 @@ macro(add_emscripten_sample sample source assets)
 endmacro()
 
 macro(add_binary_sample sample source)
-    add_executable(${sample} ${source})
-    ocv_target_include_modules(${sample} opencv_core opencv_imgproc opencv_videoio opencv_video opencv_imgcodecs opencv_v4d opencv_face opencv_tracking opencv_objdetect opencv_stitching opencv_optflow opencv_imgcodecs opencv_features2d opencv_dnn  opencv_flann)
-    ocv_target_link_libraries(${sample} LINK_PRIVATE opencv_core opencv_imgproc opencv_videoio opencv_video opencv_imgcodecs opencv_v4d opencv_face opencv_tracking opencv_objdetect opencv_stitching opencv_optflow opencv_imgcodecs opencv_features2d opencv_dnn  opencv_flann nanogui)
+    #add_executable(${sample} ${source})
+    # ocv_target_include_modules(${sample} opencv_core opencv_imgproc opencv_videoio opencv_video opencv_imgcodecs opencv_v4d opencv_face opencv_tracking opencv_objdetect opencv_stitching opencv_optflow opencv_imgcodecs opencv_features2d opencv_dnn  opencv_flann)
+    # ocv_target_link_libraries(${sample} LINK_PRIVATE opencv_core opencv_imgproc opencv_videoio opencv_video opencv_imgcodecs opencv_v4d opencv_face opencv_tracking opencv_objdetect opencv_stitching opencv_optflow opencv_imgcodecs opencv_features2d opencv_dnn opencv_flann nanogui)
     target_compile_features(${sample} PRIVATE cxx_std_20)
     target_link_directories(${sample} PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/../../lib")
     target_include_directories(${sample} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/include/opencv2/v4d/detail/")
@@ -105,11 +87,11 @@ endif()
 
 cmake_policy(SET CMP0079 NEW)
 
-ocv_add_module(v4d opencv_core opencv_imgproc opencv_videoio opencv_video)
+ocv_add_module(v4d opencv_core opencv_imgproc opencv_videoio opencv_video WRAP python)
 ocv_glob_module_sources()
 ocv_module_include_directories()
 ocv_create_module()
-ocv_add_samples(opencv_v4d)
+ocv_add_samples(opencv_v4d opencv_core opencv_imgproc opencv_videoio opencv_video opencv_imgcodecs opencv_v4d opencv_face opencv_tracking opencv_objdetect opencv_stitching opencv_optflow opencv_imgcodecs opencv_features2d opencv_dnn opencv_flann nanogui)
 
 add_custom_command(
   TARGET ${the_module} POST_BUILD