Commit 5d0a9f04 authored by Emmanuel Christophe's avatar Emmanuel Christophe
Browse files

ENH: move all ossim dependencies into a separate library

parent 4f6f1032
ADD_SUBDIRECTORY(UtilitiesAdapters)
ADD_SUBDIRECTORY(Common)
ADD_SUBDIRECTORY(BasicFilters)
ADD_SUBDIRECTORY(IO)
......@@ -19,7 +20,6 @@ ADD_SUBDIRECTORY(MultiTemporal)
ADD_SUBDIRECTORY(Fuzzy)
IF(OTB_USE_VISU_GUI)
ADD_SUBDIRECTORY(Visu)
ADD_SUBDIRECTORY(Gui)
......
......@@ -16,7 +16,7 @@ ADD_LIBRARY(OTBCommon ${OTBCommon_SRCS})
# PROPERTIES
# LINK_INTERFACE_LIBRARIES ""
#)
TARGET_LINK_LIBRARIES (OTBCommon ITKAlgorithms ITKStatistics ITKCommon otbconfigfile otbmuparser ${OGR_LIBRARY} )
TARGET_LINK_LIBRARIES (OTBCommon ITKAlgorithms ITKStatistics ITKCommon otbconfigfile otbmuparser ${OGR_LIBRARY} OTBOssimAdapters)
IF(OTB_USE_MAPNIK)
TARGET_LINK_LIBRARIES(OTBCommon ${MAPNIK_LIBRARY} ${ICUUC_LIBRARY})
ENDIF(OTB_USE_MAPNIK)
......
......@@ -3,7 +3,7 @@
FILE(GLOB OTBIO_SRCS "*.cxx" )
# Remove the otbTestDriver cause only an executable is nedded
LIST(REMOVE_ITEM OTBIO_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/otbTestDriver.cxx" )
LIST(REMOVE_ITEM OTBIO_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/otbTestDriver.cxx" )
IF(NOT OTB_COMPILE_JPEG2000)
LIST(REMOVE_ITEM OTBIO_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/otbJPEG2000ImageIO.cxx" )
......@@ -30,7 +30,7 @@ ADD_LIBRARY(OTBIO ${OTBIO_SRCS})
# LINK_INTERFACE_LIBRARIES ""
# )
TARGET_LINK_LIBRARIES (OTBIO ${TIFF_LIBRARY} ${GEOTIFF_LIBRARY} ${GDAL_LIBRARY} ${OGR_LIBRARY} ${JPEG_LIBRARY} OTBCommon OTBBasicFilters)
TARGET_LINK_LIBRARIES (OTBIO otbossim otbossimplugins ITKIO ITKCommon otbkml tinyXML)
TARGET_LINK_LIBRARIES (OTBIO ITKIO ITKCommon otbkml tinyXML)
IF (OTB_USE_LIBLAS)
IF(OTB_USE_EXTERNAL_LIBLAS)
......
ADD_SUBDIRECTORY(OssimAdapters)
# Sources of non-templated classes.
FILE(GLOB OTBOssimAdapters_SRCS "*.cxx" )
ADD_LIBRARY(OTBOssimAdapters ${OTBOssimAdapters_SRCS})
TARGET_LINK_LIBRARIES (OTBOssimAdapters otbossim otbossimplugins)
IF(OTB_LIBRARY_PROPERTIES)
SET_TARGET_PROPERTIES(OTBOssimAdapters PROPERTIES ${OTB_LIBRARY_PROPERTIES})
ENDIF(OTB_LIBRARY_PROPERTIES)
IF(NOT OTB_INSTALL_NO_LIBRARIES)
INSTALL(TARGETS OTBOssimAdapters
RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT Development)
ENDIF(NOT OTB_INSTALL_NO_LIBRARIES)
# Note: no txx allowed here
IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
FILE(GLOB __files1 "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
INSTALL(FILES ${__files1}
DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/UtilitiesAdapters/OssimAdapters
COMPONENT Development)
ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
......@@ -21,6 +21,7 @@
#include <iostream>
#include <iomanip>
#include "otbMath.h"
#include "otbAeronetData.h"
#include "base/ossimDate.h"
......
......@@ -24,10 +24,12 @@
#include "itkExceptionObject.h"
#include "itkProcessObject.h"
#include "otbMacro.h"
#include "otbAeronetData.h"
namespace otb
{
class AeronetData;
/** \class AeronetFileReaderException
* \brief Base exception class for Aeronet problems during reading.
*/
......
......@@ -18,12 +18,11 @@
#ifndef __otbDEMHandler_h
#define __otbDEMHandler_h
#include "itkIndent.h"
#include "itkImageSource.h"
#include "otbImage.h"
#include <iostream>
#include <stdio.h>
#include "itkIndent.h"
#include "itkImageSource.h"
#include "itkImageRegionIteratorWithIndex.h"
#include "itkIndent.h"
......
......@@ -17,7 +17,6 @@
=========================================================================*/
#include "otbFilterFunctionValues.h"
#include "base/ossimFilename.h"
#include <fstream>
namespace otb
......
......@@ -23,7 +23,6 @@
#include "itkMacro.h"
#include "itkVariableSizeMatrix.h"
#include "itkVariableLengthVector.h"
#include "otbObjectList.h"
#include <vector>
#include <iostream>
......
......@@ -19,13 +19,16 @@
#include <cassert>
#include "otbMacro.h"
#include "base/ossimKeywordlist.h"
#include "base/ossimString.h"
#include "ossimTileMapModel.h"
#include "ossim/ossimPluginProjectionFactory.h"
#include "imaging/ossimImageHandlerRegistry.h"
#include "ossimTileMapModel.h"
#include "otbTileMapImageIO.h"
// FIXME Temporarily deactivated
// #include "otbTileMapImageIO.h"
namespace otb
{
......@@ -179,7 +182,8 @@ ReadGeometry(const std::string& filename)
if (projection)
{
if (projection->getClassName() == "ossimTileMapModel")
// FIXME Temporarily deactivated
/* if (projection->getClassName() == "ossimTileMapModel")
{
//we need to pass the depth information which in on the IO to the projection
//to be handle throught the kwl
......@@ -191,9 +195,8 @@ ReadGeometry(const std::string& filename)
imageIO->ReadImageInformation();
int depth = imageIO->GetDepth();
dynamic_cast<ossimplugins::ossimTileMapModel*>(projection)->setDepth(depth);
}
}*/
hasMetaData = projection->saveState(geom_kwl);
// delete projection; //FIXME find out where this should occur
}
}
// Free memory
......
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