From bdd585654bc211ef5e96768b4b13cc08523380f0 Mon Sep 17 00:00:00 2001
From: Thomas Feuvrier <thomas.feuvrier@c-s.fr>
Date: Wed, 14 Jun 2006 08:07:43 +0000
Subject: [PATCH] MAJ Config GDAL
---
Utilities/CMakeLists.txt | 3 +++
otbIncludeDirectories.cmake | 12 ++++++------
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/Utilities/CMakeLists.txt b/Utilities/CMakeLists.txt
index 82bafa1733..b75f85cbde 100755
--- a/Utilities/CMakeLists.txt
+++ b/Utilities/CMakeLists.txt
@@ -6,4 +6,7 @@ IF(NOT OTB_USE_EXTERNAL_ITK)
SUBDIRS( ITK )
ENDIF(NOT OTB_USE_EXTERNAL_ITK)
+IF(NOT OTB_USE_EXTERNAL_GDAL)
+ SUBDIRS( GDAL )
+ENDIF(NOT OTB_USE_EXTERNAL_GDAL)
diff --git a/otbIncludeDirectories.cmake b/otbIncludeDirectories.cmake
index 75b25106fe..e26b297308 100644
--- a/otbIncludeDirectories.cmake
+++ b/otbIncludeDirectories.cmake
@@ -20,12 +20,12 @@ SET(OTB_INCLUDE_DIRS_BUILD_TREE ${OTB_INCLUDE_DIRS_BUILD_TREE}
#-----------------------------------------------------------------------------
# Include directories from the GDAL build tree.
-#IF(NOT OTB_USE_EXTERNAL_GDAL)
-# INCLUDE(${OTB_SOURCE_DIR}/Utilities/GDAL/gdalIncludeDirectories.cmake)
-# SET(OTB_INCLUDE_DIRS_BUILD_TREE ${OTB_INCLUDE_DIRS_BUILD_TREE}
-# ${GDAL_INCLUDE_DIRS_BUILD_TREE}
-# )
-#ENDIF(NOT OTB_USE_EXTERNAL_GDAL)
+IF(NOT OTB_USE_EXTERNAL_GDAL)
+ INCLUDE(${OTB_SOURCE_DIR}/Utilities/GDAL/gdalIncludeDirectories.cmake)
+ SET(OTB_INCLUDE_DIRS_BUILD_TREE ${OTB_INCLUDE_DIRS_BUILD_TREE}
+ ${GDAL_INCLUDE_DIRS_BUILD_TREE}
+ )
+ENDIF(NOT OTB_USE_EXTERNAL_GDAL)
#-----------------------------------------------------------------------------
# Include directories from the ITK build tree.e
--
GitLab