Merge pull request #1585 from alalek:cmake_src_include_fix

7 years ago · 84f761bf27
parent 2888fea176 4c42ed6b4f
commit 84f761bf27
6 changed files with 4 additions and 8 deletions
--- a/modules/datasets/src/tinyxml2/tinyxml2.cpp
+++ b/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
--- a/modules/saliency/src/BING/CmShow.hpp
+++ b/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
 {
--- a/modules/saliency/src/BING/CmTimer.hpp
+++ b/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
 {
--- a/modules/saliency/src/BING/objectnessBING.cpp
+++ b/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"

--- a/modules/xfeatures2d/src/pct_signatures/distance.hpp
+++ b/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
--- a/modules/xfeatures2d/src/pct_signatures/similarity.hpp
+++ b/modules/xfeatures2d/src/pct_signatures/similarity.hpp
@ -62,8 +62,6 @@ References:

 #ifdef __cplusplus

-#include "precomp.hpp"
-
 #include "distance.hpp"

 namespace cv