added #include "cvconfig.h" to make TBB and other 3rd party libs work correctly

modules/calib3d/src/precomp.hpp

@@ -43,7 +43,11 @@
 #define __OPENCV_PRECOMP_H__
 
 #if _MSC_VER >= 1200
-#pragma warning( disable: 4251 4710 4711 4514 4996 ) /* function AAA selected for automatic inline expansion */
+#pragma warning( disable: 4251 4710 4711 4514 4996 )
+#endif
+
+#ifdef HAVE_CONFIG_H 
+#include <cvconfig.h> 
 #endif
 
 #include "opencv2/calib3d/calib3d.hpp"

modules/contrib/src/precomp.hpp

@@ -44,7 +44,15 @@
 #define __OPENCV_PRECOMP_H__
 
 #if _MSC_VER >= 1200
-#pragma warning( disable: 4251 4710 4711 4514 4996 ) /* function AAA selected for automatic inline expansion */
+#pragma warning( disable: 4251 4710 4711 4514 4996 )
+#endif
+
+#ifdef HAVE_CONFIG_H 
+#include <cvconfig.h> 
+#endif
+
+#ifdef HAVE_CONFIG_H 
+#include <cvconfig.h> 
 #endif
 
 #include "opencv2/contrib/contrib.hpp"

modules/core/src/precomp.hpp

@@ -40,14 +40,18 @@
 //
 //M*/
 
-#ifndef _CXCORE_INTERNAL_H_
-#define _CXCORE_INTERNAL_H_
+#ifndef __OPENCV_PRECOMP_H__
+#define __OPENCV_PRECOMP_H__
 
 #if defined _MSC_VER && _MSC_VER >= 1200
     // disable warnings related to inline functions
     #pragma warning( disable: 4251 4711 4710 4514 )
 #endif
 
+#ifdef HAVE_CONFIG_H 
+#include <cvconfig.h> 
+#endif
+
 #include "opencv2/core/core.hpp"
 #include "opencv2/core/core_c.h"
 #include "opencv2/core/internal.hpp"

modules/features2d/src/precomp.hpp

@@ -44,7 +44,11 @@
 #define __OPENCV_PRECOMP_H__
 
 #if _MSC_VER >= 1200
-#pragma warning( disable: 4251 4710 4711 4514 4996 ) /* function AAA selected for automatic inline expansion */
+#pragma warning( disable: 4251 4710 4711 4514 4996 )
+#endif
+
+#ifdef HAVE_CONFIG_H 
+#include <cvconfig.h> 
 #endif
 
 #include "opencv2/features2d/features2d.hpp"

modules/imgproc/src/precomp.hpp

@@ -40,14 +40,18 @@
 //
 //M*/
 
-#ifndef _OPENCV_PRECOMP_HPP_
-#define _OPENCV_PRECOMP_HPP_
+#ifndef __OPENCV_PRECOMP_H__
+#define __OPENCV_PRECOMP_H__
 
 #if defined _MSC_VER && _MSC_VER >= 1200
     // disable warnings related to inline functions
     #pragma warning( disable: 4251 4711 4710 4514 )
 #endif
 
+#ifdef HAVE_CONFIG_H 
+#include <cvconfig.h> 
+#endif
+
 #include "opencv2/imgproc/imgproc.hpp"
 #include "opencv2/imgproc/imgproc_c.h"
 #include "opencv2/core/internal.hpp"

modules/legacy/src/precomp.hpp

@@ -38,11 +38,15 @@
 // the use of this software, even if advised of the possibility of such damage.
 //
 //M*/
-#ifndef __OPENCV_LEGACY_PRECOMP_H__
-#define __OPENCV_LEGACY_PRECOMP_H__
+#ifndef __OPENCV_PRECOMP_H__
+#define __OPENCV_PRECOMP_H__
 
 #if _MSC_VER >= 1200
-#pragma warning( disable: 4251 4710 4711 4514 4996 ) /* function AAA selected for automatic inline expansion */
+#pragma warning( disable: 4251 4710 4711 4514 4996 )
+#endif
+
+#ifdef HAVE_CONFIG_H 
+#include <cvconfig.h> 
 #endif
 
 #include "opencv2/legacy/legacy.hpp"

modules/ml/src/precomp.hpp

@@ -38,13 +38,17 @@
 //
 //M*/
 
-#ifndef __ML_INTERNAL_H__
-#define __ML_INTERNAL_H__
+#ifndef __OPENCV_PRECOMP_H__
+#define __OPENCV_PRECOMP_H__
 
 #if _MSC_VER >= 1200
 #pragma warning( disable: 4251 4514 4710 4711 4710 )
 #endif
 
+#ifdef HAVE_CONFIG_H 
+#include <cvconfig.h> 
+#endif
+
 #include "opencv2/ml/ml.hpp"
 #include "opencv2/core/core_c.h"
 #include "opencv2/core/internal.hpp"

modules/objdetect/src/precomp.hpp

@@ -44,7 +44,11 @@
 #define __OPENCV_PRECOMP_H__
 
 #if _MSC_VER >= 1200
-#pragma warning( disable: 4251 4710 4711 4514 4996 ) /* function AAA selected for automatic inline expansion */
+#pragma warning( disable: 4251 4710 4711 4514 4996 )
+#endif
+
+#ifdef HAVE_CONFIG_H 
+#include <cvconfig.h> 
 #endif
 
 #include "opencv2/objdetect/objdetect.hpp"

modules/video/src/precomp.hpp

@@ -44,7 +44,11 @@
 #define __OPENCV_PRECOMP_H__
 
 #if _MSC_VER >= 1200
-#pragma warning( disable: 4251 4710 4711 4514 4996 ) /* function AAA selected for automatic inline expansion */
+#pragma warning( disable: 4251 4710 4711 4514 4996 )
+#endif
+
+#ifdef HAVE_CONFIG_H 
+#include <cvconfig.h> 
 #endif
 
 #include "opencv2/video/tracking.hpp"