From d3ca00c4e6c1e8240a7d12a264dc7e5523ba4ea4 Mon Sep 17 00:00:00 2001
From: Julien Malik <julien.malik@c-s.fr>
Date: Sat, 29 Sep 2012 13:46:24 +0200
Subject: [PATCH] COMP: remove include_directories() from ImportGDAL to
otbIncludeDirectories
---
CMake/ImportGdal.cmake | 2 --
CMake/otbIncludeDirectories.cmake | 8 ++++++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/CMake/ImportGdal.cmake b/CMake/ImportGdal.cmake
index 95441f2963..ebd500eed4 100644
--- a/CMake/ImportGdal.cmake
+++ b/CMake/ImportGdal.cmake
@@ -89,7 +89,6 @@ IF(OTB_USE_EXTERNAL_GDAL)
IF (NOT JPEG_INCLUDE_DIRS)
MESSAGE(FATAL_ERROR "Cannot find jpeg headers. Please set JPEG_INCLUDE_DIRS.")
ENDIF (NOT JPEG_INCLUDE_DIRS)
- INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIRS})
# Find ogr headers
FIND_PATH(OGR_INCLUDE_DIRS ogrsf_frmts.h
@@ -98,7 +97,6 @@ IF(OTB_USE_EXTERNAL_GDAL)
IF (NOT OGR_INCLUDE_DIRS)
MESSAGE(FATAL_ERROR "Cannot find ogr headers. Please set OGR_INCLUDE_DIRS.")
ENDIF (NOT OGR_INCLUDE_DIRS)
- INCLUDE_DIRECTORIES(${OGR_INCLUDE_DIRS})
# Check if ${GDAL_LIBRARY} has tiff library
TRY_COMPILE(GDAL_HAS_TIFF
diff --git a/CMake/otbIncludeDirectories.cmake b/CMake/otbIncludeDirectories.cmake
index c667371de8..d8ddfb032d 100644
--- a/CMake/otbIncludeDirectories.cmake
+++ b/CMake/otbIncludeDirectories.cmake
@@ -68,7 +68,9 @@ ELSE(OTB_USE_EXTERNAL_BOOST)
ENDIF(OTB_USE_EXTERNAL_BOOST)
SET(OTB_INCLUDE_DIRS_BUILD_TREE ${OTB_INCLUDE_DIRS_BUILD_TREE}
- ${GDAL_INCLUDE_DIRS} )
+ ${GDAL_INCLUDE_DIRS}
+ ${JPEG_INCLUDE_DIRS}
+ ${OGR_INCLUDE_DIRS})
IF(WIN32)
SET(OTB_INCLUDE_DIRS_BUILD_TREE ${OTB_INCLUDE_DIRS_BUILD_TREE}
@@ -302,7 +304,9 @@ ENDIF(WIN32)
#For GDAL header file
SET(OTB_INCLUDE_ABSOLUE_DIRS ${OTB_INCLUDE_ABSOLUE_DIRS}
- ${GDAL_INCLUDE_DIRS} )
+ ${GDAL_INCLUDE_DIRS}
+ ${JPEG_INCLUDE_DIRS}
+ ${OGR_INCLUDE_DIRS})
#For EXPAT header file
IF(OTB_USE_EXTERNAL_EXPAT)
--
GitLab