Merge pull request #1585 from alalek:cmake_src_include_fix

modules/datasets/src/tinyxml2/tinyxml2.cpp

@@ -21,7 +21,7 @@ must not be misrepresented as being the original software.
 distribution.
 */
 
-#include "tinyxml2/tinyxml2.h"
+#include "./tinyxml2.h"
 
 #include <new>		// yes, this one new style header, is in the Android SDK.
 #   ifdef ANDROID_NDK

modules/saliency/src/BING/CmShow.hpp

@@ -42,7 +42,7 @@
 #ifndef __OPENCV_CM_SHOW_HPP__
 #define __OPENCV_CM_SHOW_HPP__
 
-#include "BING/kyheader.hpp"
+#include "kyheader.hpp"
 
 namespace cv
 {

modules/saliency/src/BING/CmTimer.hpp

@@ -42,7 +42,7 @@
 #ifndef __OPENCV_CM_TIMER_HPP__
 #define __OPENCV_CM_TIMER_HPP__
 
-#include "BING/kyheader.hpp"
+#include "kyheader.hpp"
 
 namespace cv
 {

modules/saliency/src/BING/objectnessBING.cpp

@@ -41,7 +41,7 @@
 
 #include "../precomp.hpp"
 
-#include "BING/kyheader.hpp"
+#include "kyheader.hpp"
 #include "CmTimer.hpp"
 #include "CmFile.hpp"
 

modules/xfeatures2d/src/pct_signatures/distance.hpp

@@ -62,8 +62,6 @@ References:
 #define _OPENCV_XFEATURES_2D_PCT_SIGNATURES_DISTANCE_HPP_
 
 #ifdef __cplusplus
-#include "precomp.hpp"
-
 #include "constants.hpp"
 
 namespace cv

modules/xfeatures2d/src/pct_signatures/similarity.hpp

@@ -62,8 +62,6 @@ References:
 
 #ifdef __cplusplus
 
-#include "precomp.hpp"
-
 #include "distance.hpp"
 
 namespace cv