Merge pull request #19817 An error occurred from alalek:cmake_fix_tracking_headers

modules/objc/generator/gen_objc.py

@@ -1609,7 +1609,7 @@ if __name__ == "__main__":
             with open(srcfiles_fname) as f:
                 srcfiles = [os.path.join(module_location, str(l).strip()) for l in f.readlines() if str(l).strip()]
         else:
-            re_bad = re.compile(r'(private|.inl.hpp$|_inl.hpp$|.details.hpp$|_winrt.hpp$|/cuda/|/legacy/)')
+            re_bad = re.compile(r'(private|.inl.hpp$|_inl.hpp$|.detail.hpp$|.details.hpp$|_winrt.hpp$|/cuda/|/legacy/)')
             # .h files before .hpp
             h_files = []
             hpp_files = []

modules/video/src/tracking/detail/tracker_feature.cpp

@@ -3,7 +3,7 @@
 // of this distribution and at http://opencv.org/license.html.
 
 #include "../../precomp.hpp"
-#include "opencv2/video/detail/tracking.private.hpp"
+#include "opencv2/video/detail/tracking.detail.hpp"
 
 namespace cv {
 namespace detail {

modules/video/src/tracking/detail/tracker_feature_haar.impl.hpp

@@ -3,8 +3,8 @@
 // of this distribution and at http://opencv.org/license.html.
 
 #include "../../precomp.hpp"
-#include "opencv2/video/detail/tracking.private.hpp"
-#include "opencv2/video/detail/tracking_feature.private.hpp"
+#include "opencv2/video/detail/tracking.detail.hpp"
+#include "tracking_feature.hpp"
 
 namespace cv {
 namespace detail {

modules/video/src/tracking/detail/tracker_feature_set.cpp

@@ -3,7 +3,7 @@
 // of this distribution and at http://opencv.org/license.html.
 
 #include "../../precomp.hpp"
-#include "opencv2/video/detail/tracking.private.hpp"
+#include "opencv2/video/detail/tracking.detail.hpp"
 
 namespace cv {
 namespace detail {

modules/video/src/tracking/detail/tracker_mil_model.hpp

@@ -5,7 +5,7 @@
 #ifndef __OPENCV_TRACKER_MIL_MODEL_HPP__
 #define __OPENCV_TRACKER_MIL_MODEL_HPP__
 
-#include "opencv2/video/detail/tracking.private.hpp"
+#include "opencv2/video/detail/tracking.detail.hpp"
 #include "tracker_mil_state.hpp"
 
 namespace cv {

modules/video/src/tracking/detail/tracker_mil_state.cpp

@@ -3,7 +3,7 @@
 // of this distribution and at http://opencv.org/license.html.
 
 #include "../../precomp.hpp"
-#include "opencv2/video/detail/tracking.private.hpp"
+#include "opencv2/video/detail/tracking.detail.hpp"
 #include "tracker_mil_state.hpp"
 
 namespace cv {

modules/video/src/tracking/detail/tracker_mil_state.hpp

@@ -5,7 +5,7 @@
 #ifndef OPENCV_VIDEO_DETAIL_TRACKING_MIL_STATE_HPP
 #define OPENCV_VIDEO_DETAIL_TRACKING_MIL_STATE_HPP
 
-#include "opencv2/video/detail/tracking.private.hpp"
+#include "opencv2/video/detail/tracking.detail.hpp"
 #include "tracking_online_mil.hpp"
 
 namespace cv {

modules/video/src/tracking/detail/tracker_model.cpp

@@ -3,7 +3,7 @@
 // of this distribution and at http://opencv.org/license.html.
 
 #include "../../precomp.hpp"
-#include "opencv2/video/detail/tracking.private.hpp"
+#include "opencv2/video/detail/tracking.detail.hpp"
 
 namespace cv {
 namespace detail {

modules/video/src/tracking/detail/tracker_sampler.cpp

@@ -4,7 +4,7 @@
 
 #include "../../precomp.hpp"
 
-#include "opencv2/video/detail/tracking.private.hpp"
+#include "opencv2/video/detail/tracking.detail.hpp"
 
 namespace cv {
 namespace detail {

modules/video/src/tracking/detail/tracker_sampler_algorithm.cpp

@@ -3,7 +3,7 @@
 // of this distribution and at http://opencv.org/license.html.
 
 #include "../../precomp.hpp"
-#include "opencv2/video/detail/tracking.private.hpp"
+#include "opencv2/video/detail/tracking.detail.hpp"
 
 namespace cv {
 namespace detail {

modules/video/src/tracking/detail/tracker_state_estimator.cpp

@@ -3,7 +3,7 @@
 // of this distribution and at http://opencv.org/license.html.
 
 #include "../../precomp.hpp"
-#include "opencv2/video/detail/tracking.private.hpp"
+#include "opencv2/video/detail/tracking.detail.hpp"
 
 namespace cv {
 namespace detail {

modules/video/src/tracking/detail/tracking_feature.cpp

@@ -3,8 +3,8 @@
 // of this distribution and at http://opencv.org/license.html.
 
 #include "../../precomp.hpp"
-#include "opencv2/video/detail/tracking.private.hpp"
-#include "opencv2/video/detail/tracking_feature.private.hpp"
+#include "opencv2/video/detail/tracking.detail.hpp"
+#include "tracking_feature.hpp"
 
 namespace cv {
 namespace detail {