Commit 8004e737 authored by Thomas Feuvrier's avatar Thomas Feuvrier
Browse files

Suppression provisoire de la Galib pour Release 2.2.0

parent 5d616075
......@@ -236,23 +236,23 @@ LINK_DIRECTORIES( ${GDAL_LIBRARY_DIRS} )
# EXPAT Library
#-------------------------------
#FIND_PACKAGE(EXPAT)
#IF(EXPAT_FOUND)
#INCLUDE_DIRECTORIES(${EXPAT_INCLUDE_DIR})
#MESSAGE(${EXPAT_INCLUDE_DIR})
#LINK_DIRECTORIES( ${EXPAT_LIBRARY} )
#TRY_COMPILE(OTB_TYPE_COMPILE_EXPAT
# ${OTB_BINARY_DIR}/CMakeTmp
# ${OTB_SOURCE_DIR}/CMake/otbTestCompileExpat.cxx )
#IF(OTB_TYPE_COMPILE_EXPAT)
# SET(OTB_USE_EXTERNAL_EXPAT ON CACHE INTERNAL "Use an outside build of EXPAT.")
#ELSE(OTB_TYPE_COMPILE_EXPAT)
# SET(OTB_USE_EXTERNAL_EXPAT OFF CACHE INTERNAL "Use an OTB internal build of EXPAT.")
#ENDIF( OTB_TYPE_COMPILE_EXPAT)
#ELSE(EXPAT_FOUND)
SET(OTB_USE_EXTERNAL_EXPAT OFF CACHE INTERNAL "Use an OTB internal build of EXPAT.")
#ENDIF(EXPAT_FOUND)
# FIND_PACKAGE(EXPAT)
# IF(EXPAT_FOUND)
# INCLUDE_DIRECTORIES(${EXPAT_INCLUDE_DIR})
# MESSAGE(${EXPAT_INCLUDE_DIR})
# LINK_DIRECTORIES( ${EXPAT_LIBRARY} )
# TRY_COMPILE(OTB_TYPE_COMPILE_EXPAT
# ${OTB_BINARY_DIR}/CMakeTmp
# ${OTB_SOURCE_DIR}/CMake/otbTestCompileExpat.cxx )
# IF(OTB_TYPE_COMPILE_EXPAT)
# SET(OTB_USE_EXTERNAL_EXPAT ON CACHE INTERNAL "Use an outside build of EXPAT.")
# ELSE(OTB_TYPE_COMPILE_EXPAT)
# SET(OTB_USE_EXTERNAL_EXPAT OFF CACHE INTERNAL "Use an OTB internal build of EXPAT.")
# ENDIF( OTB_TYPE_COMPILE_EXPAT)
# ELSE(EXPAT_FOUND)
# SET(OTB_USE_EXTERNAL_EXPAT OFF CACHE INTERNAL "Use an OTB internal build of EXPAT.")
# ENDIF(EXPAT_FOUND)
#-------------------------------
......
......@@ -12,9 +12,9 @@ IF(NOT OTB_USE_EXTERNAL_EXPAT)
#SUBDIRS( otbexpat )
ENDIF(NOT OTB_USE_EXTERNAL_EXPAT)
#ROMAIN
#Supress libraries not used by the 2.2.0 version
#SUBDIRS(BGL otbsvm dxflib InsightJournal otbossim otb6S otbgeotiff tinyXMLlib otbgalib otbkml)
SUBDIRS(BGL otbsvm dxflib InsightJournal otbossim otb6S otbgeotiff tinyXMLlib otbgalib)
SUBDIRS(BGL otbsvm dxflib InsightJournal otbossim otb6S otbgeotiff tinyXMLlib)
IF(BUILD_TESTING)
SUBDIRS( Dart )
......
......@@ -37,11 +37,11 @@ SET(OTB_INCLUDE_DIRS_BUILD_TREE ${OTB_INCLUDE_DIRS_BUILD_TREE}
${OTB_SOURCE_DIR}/Utilities/otbgeotiff/libxtiff
${OTB_SOURCE_DIR}/Utilities/tinyXMLlib
${OTB_SOURCE_DIR}/Utilities/otbopenjpeg/libopenjpeg
${OTB_SOURCE_DIR}/Utilities/otbgalib
${OTB_SOURCE_DIR}/Utilities/otbkml
${OTB_SOURCE_DIR}/Utilities/otbkml/src
${OTB_SOURCE_DIR}/Utilities/otbkml/third_party/zlib-1.2.3
${OTB_SOURCE_DIR}/Utilities/otbkml/third_party/zlib-1.2.3/contrib
# ${OTB_SOURCE_DIR}/Utilities/otbgalib
# ${OTB_SOURCE_DIR}/Utilities/otbkml
# ${OTB_SOURCE_DIR}/Utilities/otbkml/src
# ${OTB_SOURCE_DIR}/Utilities/otbkml/third_party/zlib-1.2.3
# ${OTB_SOURCE_DIR}/Utilities/otbkml/third_party/zlib-1.2.3/contrib
)
#-----------------------------------------------------------------------------
......@@ -187,10 +187,10 @@ SET(OTB_INCLUDE_DIRS_INSTALL_TREE ${OTB_INCLUDE_DIRS_INSTALL_TREE}
${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbgeotiff/libxtiff
${OTB_INSTALL_INCLUDE_DIR}/Utilities/tinyXMLlib
${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbopenjpeg/libopenjpeg
${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbgalib
${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbkml
${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbkml/third_party/zlib-1.2.3
${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbkml/third_party/zlib-1.2.3/contrib
# ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbgalib
# ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbkml
# ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbkml/third_party/zlib-1.2.3
# ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbkml/third_party/zlib-1.2.3/contrib
)
#For GDAL header file
......@@ -198,13 +198,13 @@ SET(OTB_INCLUDE_DIRS_INSTALL_TREE ${OTB_INCLUDE_DIRS_INSTALL_TREE}
${GDAL_INCLUDE_DIRS} )
#For EXPAT header file
IF(OTB_USE_EXTERNAL_EXPAT)
SET(OTB_INCLUDE_DIRS_INSTALL_TREE ${OTB_INCLUDE_DIRS_INSTALL_TREE}
${EXPAT_INCLUDE_DIR} )
ELSE(OTB_USE_EXTERNAL_EXPAT)
SET(OTB_INCLUDE_DIRS_INSTALL_TREE ${OTB_INCLUDE_DIRS_INSTALL_TREE}
${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbexpat )
ENDIF(OTB_USE_EXTERNAL_EXPAT)
#IF(OTB_USE_EXTERNAL_EXPAT)
# SET(OTB_INCLUDE_DIRS_INSTALL_TREE ${OTB_INCLUDE_DIRS_INSTALL_TREE}
# ${EXPAT_INCLUDE_DIR} )
#ELSE(OTB_USE_EXTERNAL_EXPAT)
# SET(OTB_INCLUDE_DIRS_INSTALL_TREE ${OTB_INCLUDE_DIRS_INSTALL_TREE}
# ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbexpat )
#ENDIF(OTB_USE_EXTERNAL_EXPAT)
#For CURL header file
IF(OTB_USE_CURL)
......
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