diff --git a/CMakeLists.txt b/CMakeLists.txt index f464b2263c..444f3d7022 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -296,7 +296,6 @@ endif() # Path for build/platform -specific headers # ---------------------------------------------------------------------------- set(OPENCV_CONFIG_FILE_INCLUDE_DIR "${CMAKE_BINARY_DIR}/" CACHE PATH "Where to create the platform-dependant cvconfig.h") -add_definitions(-DHAVE_CVCONFIG_H) ocv_include_directories(${OPENCV_CONFIG_FILE_INCLUDE_DIR}) # ---------------------------------------------------------------------------- diff --git a/modules/calib3d/src/precomp.hpp b/modules/calib3d/src/precomp.hpp index 9b1f433ad4..e96ba533fa 100644 --- a/modules/calib3d/src/precomp.hpp +++ b/modules/calib3d/src/precomp.hpp @@ -42,9 +42,7 @@ #ifndef __OPENCV_PRECOMP_H__ #define __OPENCV_PRECOMP_H__ -#ifdef HAVE_CVCONFIG_H #include "cvconfig.h" -#endif #include "opencv2/calib3d/calib3d.hpp" #include "opencv2/imgproc/imgproc.hpp" diff --git a/modules/contrib/src/precomp.hpp b/modules/contrib/src/precomp.hpp index 7c8e6bdf81..30232f763c 100644 --- a/modules/contrib/src/precomp.hpp +++ b/modules/contrib/src/precomp.hpp @@ -43,9 +43,7 @@ #ifndef __OPENCV_PRECOMP_H__ #define __OPENCV_PRECOMP_H__ -#ifdef HAVE_CVCONFIG_H #include "cvconfig.h" -#endif #include "opencv2/contrib/contrib.hpp" #include "opencv2/features2d/features2d.hpp" diff --git a/modules/core/src/precomp.hpp b/modules/core/src/precomp.hpp index 84f7f5e2be..c53224e0aa 100644 --- a/modules/core/src/precomp.hpp +++ b/modules/core/src/precomp.hpp @@ -43,9 +43,7 @@ #ifndef __OPENCV_PRECOMP_H__ #define __OPENCV_PRECOMP_H__ -#ifdef HAVE_CVCONFIG_H #include "cvconfig.h" -#endif #include "opencv2/core/core.hpp" #include "opencv2/core/core_c.h" diff --git a/modules/features2d/src/precomp.hpp b/modules/features2d/src/precomp.hpp index cbc1eb690a..72f6186000 100644 --- a/modules/features2d/src/precomp.hpp +++ b/modules/features2d/src/precomp.hpp @@ -43,9 +43,7 @@ #ifndef __OPENCV_PRECOMP_H__ #define __OPENCV_PRECOMP_H__ -#ifdef HAVE_CVCONFIG_H #include "cvconfig.h" -#endif #include "opencv2/features2d/features2d.hpp" #include "opencv2/imgproc/imgproc.hpp" diff --git a/modules/flann/src/precomp.hpp b/modules/flann/src/precomp.hpp index fb5ee3f982..76d83992e5 100644 --- a/modules/flann/src/precomp.hpp +++ b/modules/flann/src/precomp.hpp @@ -5,9 +5,7 @@ #include #include -#ifdef HAVE_CVCONFIG_H # include "cvconfig.h" -#endif #include "opencv2/core/core.hpp" #include "opencv2/core/internal.hpp" diff --git a/modules/gpu/perf4au/main.cpp b/modules/gpu/perf4au/main.cpp index f6a65ad636..f190bc1a9c 100644 --- a/modules/gpu/perf4au/main.cpp +++ b/modules/gpu/perf4au/main.cpp @@ -42,9 +42,7 @@ #include -#ifdef HAVE_CVCONFIG_H #include "cvconfig.h" -#endif #include "opencv2/ts/ts.hpp" #include "opencv2/ts/gpu_perf.hpp" diff --git a/modules/gpu/src/precomp.hpp b/modules/gpu/src/precomp.hpp index 06d5386405..d3a4467ea1 100644 --- a/modules/gpu/src/precomp.hpp +++ b/modules/gpu/src/precomp.hpp @@ -47,9 +47,7 @@ #pragma warning( disable: 4251 4710 4711 4514 4996 ) #endif -#ifdef HAVE_CVCONFIG_H #include "cvconfig.h" -#endif #include #include diff --git a/modules/highgui/test/test_precomp.hpp b/modules/highgui/test/test_precomp.hpp index be06c0643a..5e030810fa 100644 --- a/modules/highgui/test/test_precomp.hpp +++ b/modules/highgui/test/test_precomp.hpp @@ -9,9 +9,7 @@ #ifndef __OPENCV_TEST_PRECOMP_HPP__ #define __OPENCV_TEST_PRECOMP_HPP__ -#ifdef HAVE_CVCONFIG_H # include "cvconfig.h" -#endif #include "opencv2/ts/ts.hpp" #include "opencv2/imgproc/imgproc.hpp" diff --git a/modules/imgproc/src/precomp.hpp b/modules/imgproc/src/precomp.hpp index 842a15ceaf..20101b77b5 100644 --- a/modules/imgproc/src/precomp.hpp +++ b/modules/imgproc/src/precomp.hpp @@ -43,9 +43,7 @@ #ifndef __OPENCV_PRECOMP_H__ #define __OPENCV_PRECOMP_H__ -#ifdef HAVE_CVCONFIG_H #include "cvconfig.h" -#endif #include "opencv2/imgproc/imgproc.hpp" #include "opencv2/imgproc/imgproc_c.h" diff --git a/modules/legacy/src/precomp.hpp b/modules/legacy/src/precomp.hpp index 48b9e4a230..383b694ba2 100644 --- a/modules/legacy/src/precomp.hpp +++ b/modules/legacy/src/precomp.hpp @@ -41,9 +41,7 @@ #ifndef __OPENCV_PRECOMP_H__ #define __OPENCV_PRECOMP_H__ -#ifdef HAVE_CVCONFIG_H #include "cvconfig.h" -#endif #include "opencv2/legacy/legacy.hpp" diff --git a/modules/ml/src/precomp.hpp b/modules/ml/src/precomp.hpp index 63002a8e85..b4ae21a55e 100644 --- a/modules/ml/src/precomp.hpp +++ b/modules/ml/src/precomp.hpp @@ -41,9 +41,7 @@ #ifndef __OPENCV_PRECOMP_H__ #define __OPENCV_PRECOMP_H__ -#ifdef HAVE_CVCONFIG_H #include "cvconfig.h" -#endif #include "opencv2/ml/ml.hpp" #include "opencv2/core/core_c.h" diff --git a/modules/nonfree/src/precomp.hpp b/modules/nonfree/src/precomp.hpp index 6c46114c76..2abe6038ac 100644 --- a/modules/nonfree/src/precomp.hpp +++ b/modules/nonfree/src/precomp.hpp @@ -43,9 +43,7 @@ #ifndef __OPENCV_PRECOMP_H__ #define __OPENCV_PRECOMP_H__ -#ifdef HAVE_CVCONFIG_H #include "cvconfig.h" -#endif #include "opencv2/opencv_modules.hpp" diff --git a/modules/objdetect/src/precomp.hpp b/modules/objdetect/src/precomp.hpp index 560ed45a20..37f3673a4a 100644 --- a/modules/objdetect/src/precomp.hpp +++ b/modules/objdetect/src/precomp.hpp @@ -43,9 +43,7 @@ #ifndef __OPENCV_PRECOMP_H__ #define __OPENCV_PRECOMP_H__ -#ifdef HAVE_CVCONFIG_H #include "cvconfig.h" -#endif #include "opencv2/objdetect/objdetect.hpp" #include "opencv2/imgproc/imgproc.hpp" diff --git a/modules/objdetect/test/test_latentsvmdetector.cpp b/modules/objdetect/test/test_latentsvmdetector.cpp index b595d7ac51..1efa55f50f 100644 --- a/modules/objdetect/test/test_latentsvmdetector.cpp +++ b/modules/objdetect/test/test_latentsvmdetector.cpp @@ -44,9 +44,7 @@ #include -#ifdef HAVE_CVCONFIG_H #include "cvconfig.h" -#endif #ifdef HAVE_TBB #include "tbb/task_scheduler_init.h" diff --git a/modules/ocl/src/precomp.hpp b/modules/ocl/src/precomp.hpp index 4f93eac420..8050b909b7 100644 --- a/modules/ocl/src/precomp.hpp +++ b/modules/ocl/src/precomp.hpp @@ -52,9 +52,7 @@ #pragma warning( disable: 4267 4324 4244 4251 4710 4711 4514 4996 ) #endif -#ifdef HAVE_CVCONFIG_H #include "cvconfig.h" -#endif #include #include diff --git a/modules/photo/src/precomp.hpp b/modules/photo/src/precomp.hpp index 3185a18b86..196867625a 100644 --- a/modules/photo/src/precomp.hpp +++ b/modules/photo/src/precomp.hpp @@ -43,9 +43,7 @@ #ifndef __OPENCV_PRECOMP_H__ #define __OPENCV_PRECOMP_H__ -#ifdef HAVE_CVCONFIG_H #include "cvconfig.h" -#endif #include "opencv2/photo/photo.hpp" diff --git a/modules/stitching/src/precomp.hpp b/modules/stitching/src/precomp.hpp index 4849ace1eb..1050856d31 100644 --- a/modules/stitching/src/precomp.hpp +++ b/modules/stitching/src/precomp.hpp @@ -43,9 +43,7 @@ #ifndef __OPENCV_STITCHING_PRECOMP_H__ #define __OPENCV_STITCHING_PRECOMP_H__ -#ifdef HAVE_CVCONFIG_H #include "cvconfig.h" -#endif #include "opencv2/opencv_modules.hpp" #include diff --git a/modules/superres/perf/perf_precomp.hpp b/modules/superres/perf/perf_precomp.hpp index f05203718c..d64d5008c6 100644 --- a/modules/superres/perf/perf_precomp.hpp +++ b/modules/superres/perf/perf_precomp.hpp @@ -51,9 +51,7 @@ #ifndef __OPENCV_PERF_PRECOMP_HPP__ #define __OPENCV_PERF_PRECOMP_HPP__ -#ifdef HAVE_CVCONFIG_H #include "cvconfig.h" -#endif #include "opencv2/ts/ts.hpp" #include "opencv2/ts/gpu_perf.hpp" diff --git a/modules/superres/src/precomp.hpp b/modules/superres/src/precomp.hpp index 82b591b3c2..5df45ed33a 100644 --- a/modules/superres/src/precomp.hpp +++ b/modules/superres/src/precomp.hpp @@ -46,9 +46,7 @@ #include #include -#ifdef HAVE_CVCONFIG_H #include "cvconfig.h" -#endif #include "opencv2/opencv_modules.hpp" #include "opencv2/core/core.hpp" diff --git a/modules/superres/test/test_precomp.hpp b/modules/superres/test/test_precomp.hpp index 0371c34a91..8102d432b5 100644 --- a/modules/superres/test/test_precomp.hpp +++ b/modules/superres/test/test_precomp.hpp @@ -51,9 +51,7 @@ #ifndef __OPENCV_TEST_PRECOMP_HPP__ #define __OPENCV_TEST_PRECOMP_HPP__ -#ifdef HAVE_CVCONFIG_H #include "cvconfig.h" -#endif #include "opencv2/opencv_modules.hpp" #include "opencv2/core/core.hpp" diff --git a/modules/ts/include/opencv2/ts/ts.hpp b/modules/ts/include/opencv2/ts/ts.hpp index fcef5896c6..5b58960986 100644 --- a/modules/ts/include/opencv2/ts/ts.hpp +++ b/modules/ts/include/opencv2/ts/ts.hpp @@ -1,9 +1,7 @@ #ifndef __OPENCV_GTESTCV_HPP__ #define __OPENCV_GTESTCV_HPP__ -#ifdef HAVE_CVCONFIG_H #include "cvconfig.h" -#endif #ifndef GTEST_CREATE_SHARED_LIBRARY #ifdef BUILD_SHARED_LIBS #define GTEST_LINKED_AS_SHARED_LIBRARY 1 diff --git a/modules/video/src/precomp.hpp b/modules/video/src/precomp.hpp index 58fc550862..9b6077f1e5 100644 --- a/modules/video/src/precomp.hpp +++ b/modules/video/src/precomp.hpp @@ -43,9 +43,7 @@ #ifndef __OPENCV_PRECOMP_H__ #define __OPENCV_PRECOMP_H__ -#ifdef HAVE_CVCONFIG_H #include "cvconfig.h" -#endif #include "opencv2/video/tracking.hpp" #include "opencv2/video/background_segm.hpp" diff --git a/modules/videostab/src/precomp.hpp b/modules/videostab/src/precomp.hpp index c1d8e3039a..f718d0e8ed 100644 --- a/modules/videostab/src/precomp.hpp +++ b/modules/videostab/src/precomp.hpp @@ -43,9 +43,7 @@ #ifndef __OPENCV_PRECOMP_HPP__ #define __OPENCV_PRECOMP_HPP__ -#ifdef HAVE_CVCONFIG_H #include "cvconfig.h" -#endif #include #include diff --git a/modules/world/src/precomp.hpp b/modules/world/src/precomp.hpp index 263095700d..4d88e8c219 100644 --- a/modules/world/src/precomp.hpp +++ b/modules/world/src/precomp.hpp @@ -43,9 +43,7 @@ #ifndef __OPENCV_PRECOMP_H__ #define __OPENCV_PRECOMP_H__ -#ifdef HAVE_CVCONFIG_H #include "cvconfig.h" -#endif #include "opencv2/opencv_modules.hpp" #ifdef HAVE_OPENCV_VIDEO