Commit 45178e13 authored by Romain Garrigues's avatar Romain Garrigues
Browse files

Mise en commentaire de la compilation et des tests de la lib kml (problème de...

Mise en commentaire de la compilation et des tests de la lib kml (problème de compilation non résolu pour l'instant)
parent c0d14ebf
......@@ -236,22 +236,24 @@ LINK_DIRECTORIES( ${GDAL_LIBRARY_DIRS} )
# EXPAT Library
#-------------------------------
FIND_PACKAGE(EXPAT)
IF(EXPAT_FOUND)
INCLUDE_DIRECTORIES(${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)
#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( 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)
#ENDIF(EXPAT_FOUND)
......
......@@ -410,23 +410,25 @@ FOREACH(loop_var RANGE 1 27 1)
TARGET_LINK_LIBRARIES(otbGalibTests${loop_var} otbgalib OTBIO OTBCommon)
ENDFOREACH(loop_var)
# ROMAIN
# ------- CXX and EXECUTABLES files for KML Tests -----------------------------------
# hellofeatures
FOREACH(filename createkml helloattrs helloenum hellofolder
hellogeometry hellohref hellokmz helloregion helloserializer
helloworld parsekml prettykml printgeometry
)
ADD_EXECUTABLE(otbKmlTests${filename} kml${filename}.cc )
TARGET_LINK_LIBRARIES(otbKmlTests${filename} otbkml OTBIO OTBCommon)
IF( OTB_USE_EXTERNAL_EXPAT )
TARGET_LINK_LIBRARIES(otbKmlTests${filename} expat)
ELSE( OTB_USE_EXTERNAL_EXPAT )
TARGET_LINK_LIBRARIES(otbKmlTests${filename} otbexpat)
ENDIF( OTB_USE_EXTERNAL_EXPAT )
IF(UNIX)
TARGET_LINK_LIBRARIES (otbKmlTests${filename} m)
ENDIF(UNIX)
ENDFOREACH(filename)
#FOREACH(filename createkml helloattrs helloenum hellofolder
# hellogeometry hellohref hellokmz helloregion helloserializer
# helloworld parsekml prettykml printgeometry
# )
# ADD_EXECUTABLE(otbKmlTests${filename} kml${filename}.cc )
# TARGET_LINK_LIBRARIES(otbKmlTests${filename} otbkml OTBIO OTBCommon)
# IF( OTB_USE_EXTERNAL_EXPAT )
# TARGET_LINK_LIBRARIES(otbKmlTests${filename} expat)
# ELSE( OTB_USE_EXTERNAL_EXPAT )
# TARGET_LINK_LIBRARIES(otbKmlTests${filename} otbexpat)
# ENDIF( OTB_USE_EXTERNAL_EXPAT )
# IF(UNIX)
# TARGET_LINK_LIBRARIES (otbKmlTests${filename} m)
# ENDIF(UNIX)
#ENDFOREACH(filename)
# Original 6S main executable in C
......
......@@ -9,10 +9,14 @@ IF(NOT OTB_USE_EXTERNAL_FLTK)
ENDIF(NOT OTB_USE_EXTERNAL_FLTK)
IF(NOT OTB_USE_EXTERNAL_EXPAT)
SUBDIRS( otbexpat )
#SUBDIRS( otbexpat )
ENDIF(NOT OTB_USE_EXTERNAL_EXPAT)
SUBDIRS(BGL otbsvm dxflib InsightJournal otbossim otb6S otbgeotiff tinyXMLlib otbgalib otbkml)
MESSAGE(${OTB_USE_EXTERNAL_EXPAT})
#ROMAIN
#SUBDIRS(BGL otbsvm dxflib InsightJournal otbossim otb6S otbgeotiff tinyXMLlib otbgalib otbkml)
SUBDIRS(BGL otbsvm dxflib InsightJournal otbossim otb6S otbgeotiff tinyXMLlib otbgalib)
IF(BUILD_TESTING)
SUBDIRS( Dart )
......
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