Commit 412cacbc authored by Thomas Feuvrier's avatar Thomas Feuvrier
Browse files

Suppression (provisoire) de la compilation de GDAL en interne

parent aeac4cf5
......@@ -127,9 +127,9 @@ ENDIF(OTB_USE_EXTERNAL_ITK)
#-------------------------------
# Librairie GDAL
#-------------------------------
OPTION(OTB_USE_EXTERNAL_GDAL "Use an outside build of GDAL." ON)
# OPTION(OTB_USE_EXTERNAL_GDAL "Use an outside build of GDAL." ON)
# MARK_AS_ADVANCED(OTB_USE_EXTERNAL_GDAL)
IF(OTB_USE_EXTERNAL_GDAL)
# IF(OTB_USE_EXTERNAL_GDAL)
FIND_LIBRARY(GDAL_LIBRARY NAMES gdal PATHS $ENV{GDAL_DIR_LIB} )
FIND_PATH(GDAL_INCLUDES gdal.h $ENV{GDAL_DIR_INCLUDES} )
......@@ -141,7 +141,7 @@ IF(OTB_USE_EXTERNAL_GDAL)
INCLUDE_DIRECTORIES(${GDAL_INCLUDES})
LINK_DIRECTORIES( $ENV{GDAL_DIR_LIB} )
ENDIF(OTB_USE_EXTERNAL_GDAL)
# ENDIF(OTB_USE_EXTERNAL_GDAL)
#-------------------------------
......@@ -149,20 +149,14 @@ ENDIF(OTB_USE_EXTERNAL_GDAL)
#-------------------------------
# Add an option to use or not use FLTK (http://www.fltk.org)
OPTION(OTB_USE_EXTERNAL_FLTK "Use an outside build of FLTK." ON)
# MARK_AS_ADVANCED(OTB_USE_EXTERNAL_FLTK)
IF(OTB_USE_EXTERNAL_FLTK)
FIND_PACKAGE(FLTK)
IF(FLTK_FOUND)
# INCLUDE(${FLTK_USE_FILE})
FIND_PACKAGE(FLTK)
IF(FLTK_FOUND)
# INCLUDE(${FLTK_USE_FILE})
INCLUDE_DIRECTORIES(${FLTK_INCLUDE_DIR})
ELSE(FLTK_FOUND)
ELSE(FLTK_FOUND)
MESSAGE(FATAL_ERROR
"Cannot build OTB project without FLTK. Please set FLTK_DIR or set OTB_USE_EXTERNAL_FLTK OFF to use INTERNAL FLTK set on OTB/Utilities repository.")
ENDIF(FLTK_FOUND)
ENDIF(OTB_USE_EXTERNAL_FLTK)
ENDIF(FLTK_FOUND)
#-------------------------------
# End connections whith external libraries
......
......@@ -6,7 +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)
#IF(NOT OTB_USE_EXTERNAL_GDAL)
# SUBDIRS( GDAL )
#ENDIF(NOT OTB_USE_EXTERNAL_GDAL)
......@@ -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
......@@ -36,15 +36,6 @@ IF(NOT OTB_USE_EXTERNAL_ITK)
)
ENDIF(NOT OTB_USE_EXTERNAL_ITK)
#-----------------------------------------------------------------------------
# Include directories from the FLTK build tree.
#IF(NOT OTB_USE_EXTERNAL_FLTK)
# INCLUDE(${OTB_SOURCE_DIR}/Utilities/FLTK/fltkIncludeDirectories.cmake)
# SET(OTB_INCLUDE_DIRS_BUILD_TREE ${OTB_INCLUDE_DIRS_BUILD_TREE}
# ${FLTK_INCLUDE_DIRS_BUILD_TREE}
# )
#ENDIF(NOT OTB_USE_EXTERNAL_FLTK)
#-----------------------------------------------------------------------------
# Include directories from the CAI build tree.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment