diff --git a/Utilities/CMakeLists.txt b/Utilities/CMakeLists.txt index 82bafa1733d61a0f44735c0bcf5767985f74fd20..b75f85cbdef705ddf7d3cf631bdfe0815196f9d3 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 75b25106fe958fc3f26debe34508521fa995f87a..e26b29730859ae5f9e9a0f452404b63e4c51b1ba 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