Merge pull request #4002 from marvins:gdal-fix

2015-05-12 14:33:06 +00:00 · 2015-05-12 14:33:06 +00:00 · b8d40b4ad5
commit b8d40b4ad5
parent a31b29308f ae933db526
2 changed files with 4 additions and 3 deletions
--- a/cmake/OpenCVFindLibsGrfmt.cmake
+++ b/cmake/OpenCVFindLibsGrfmt.cmake
@ -208,5 +208,6 @@ if(WITH_GDAL)
        set(HAVE_GDAL NO)
    else()
        set(HAVE_GDAL YES)
+        ocv_include_directories(${GDAL_INCLUDE_DIR})
    endif()
 endif()
--- a/modules/imgcodecs/src/grfmt_gdal.hpp
+++ b/modules/imgcodecs/src/grfmt_gdal.hpp
@ -52,9 +52,9 @@
 #include <iostream>

 /// Geospatial Data Abstraction Library
-#include <gdal/cpl_conv.h>
-#include <gdal/gdal_priv.h>
-#include <gdal/gdal.h>
+#include <cpl_conv.h>
+#include <gdal_priv.h>
+#include <gdal.h>


 /// Start of CV Namespace