diff --git a/CMakeLists.txt b/CMakeLists.txt index a402700ac3e89055836bc038fa444f036a4bcd98..ffe0f0971b9737aef81f1804e9de38f4c49e3dd3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/Testing/Utilities/CMakeLists.txt b/Testing/Utilities/CMakeLists.txt index 3a2834111e46ddc220a10dddb5f286c7590b2eb8..edeed37f8a9f4746afb0e5b737bde1d5565f302a 100644 --- a/Testing/Utilities/CMakeLists.txt +++ b/Testing/Utilities/CMakeLists.txt @@ -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 diff --git a/Utilities/CMakeLists.txt b/Utilities/CMakeLists.txt index 9ca001f68365a9d58c314f9e7f060adbc782085c..05d88dddfb4a049d2daae23d3c83af2e33392cc0 100755 --- a/Utilities/CMakeLists.txt +++ b/Utilities/CMakeLists.txt @@ -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 )