Remove HAVE_CVCONFIG_H - it's always defined.

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})
 
 # ----------------------------------------------------------------------------

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"

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"

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"

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"

modules/flann/src/precomp.hpp

@@ -5,9 +5,7 @@
 #include <cstdarg>
 #include <sstream>
 
-#ifdef HAVE_CVCONFIG_H
 # include "cvconfig.h"
-#endif
 #include "opencv2/core/core.hpp"
 #include "opencv2/core/internal.hpp"
 

modules/gpu/perf4au/main.cpp

@@ -42,9 +42,7 @@
 
 #include <cstdio>
 
-#ifdef HAVE_CVCONFIG_H
 #include "cvconfig.h"
-#endif
 
 #include "opencv2/ts/ts.hpp"
 #include "opencv2/ts/gpu_perf.hpp"

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 <cstring>
 #include <iostream>

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"

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"

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"
 

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"

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"
 

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"

modules/objdetect/test/test_latentsvmdetector.cpp

@@ -44,9 +44,7 @@
 
 #include <string>
 
-#ifdef HAVE_CVCONFIG_H
 #include "cvconfig.h"
-#endif
 
 #ifdef HAVE_TBB
 #include "tbb/task_scheduler_init.h"

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 <map>
 #include <iostream>

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"
 

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 <vector>

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"

modules/superres/src/precomp.hpp

@@ -46,9 +46,7 @@
 #include <vector>
 #include <limits>
 
-#ifdef HAVE_CVCONFIG_H
   #include "cvconfig.h"
-#endif
 
 #include "opencv2/opencv_modules.hpp"
 #include "opencv2/core/core.hpp"

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"

modules/ts/include/opencv2/ts/ts.hpp

 #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

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"

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 <stdexcept>
 #include <iostream>

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