generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Updating CMake to get GDAL working again on OS X.

Browse Source
This commit is contained in:
Marvin Smith
2015-01-17 16:59:56 -08:00
parent df57d038b8
commit 9a1a9d9aff
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
modules/imgcodecs/CMakeLists.txt
View File

@@ -51,6 +51,7 @@ if(HAVE_OPENEXR)
endif() endif()
if(HAVE_GDAL) if(HAVE_GDAL)
add_definitions(-DHAVE_GDAL)
include_directories(SYSTEM ${GDAL_INCLUDE_DIR}) include_directories(SYSTEM ${GDAL_INCLUDE_DIR})
list(APPEND GRFMT_LIBS ${GDAL_LIBRARY}) list(APPEND GRFMT_LIBS ${GDAL_LIBRARY})
endif() endif()

1
modules/imgcodecs/src/grfmt_gdal.cpp
View File

@@ -38,6 +38,7 @@
// the use of this software, even if advised of the possibility of such damage. // the use of this software, even if advised of the possibility of such damage.
// //
//M*/ //M*/
#include "precomp.hpp"
#include "grfmt_gdal.hpp" #include "grfmt_gdal.hpp"
#ifdef HAVE_GDAL #ifdef HAVE_GDAL