Merge pull request #19365 from alalek:parallel_api
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 27 Jan 2021 18:12:15 +0000 (18:12 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 27 Jan 2021 18:12:15 +0000 (18:12 +0000)
1  2 
modules/core/CMakeLists.txt
samples/cpp/CMakeLists.txt

Simple merge
@@@ -33,11 -30,10 +33,12 @@@ if(NOT HAVE_opencv_cudaarithm OR NOT HA
    ocv_list_filterout(cpp_samples "/gpu/")
  endif()
  ocv_list_filterout(cpp_samples "real_time_pose_estimation/")
+ ocv_list_filterout(cpp_samples "parallel_backend/")
  foreach(sample_filename ${cpp_samples})
    set(package "cpp")
 -  if(sample_filename MATCHES "tutorial_code")
 +  if(sample_filename MATCHES "tutorial_code/snippet")
 +    set(package "snippet")
 +  elseif(sample_filename MATCHES "tutorial_code")
      set(package "tutorial")
    endif()
    ocv_define_sample(tgt ${sample_filename} ${package})