Commit 83db288b authored by Cyrille Valladeau's avatar Cyrille Valladeau

MRG

parents 7b028dfc f58a8dfc
......@@ -12,13 +12,16 @@ ENDIF( NOT OTB_USE_PQXX )
ADD_LIBRARY(OTBCommon ${OTBCommon_SRCS})
SET_TARGET_PROPERTIES(OTBCommon
PROPERTIES
LINK_INTERFACE_LIBRARIES ""
)
TARGET_LINK_LIBRARIES (OTBCommon ITKAlgorithms ITKStatistics ITKCommon otbconfigfile)
IF(OTB_USE_MAPNIK)
TARGET_LINK_LIBRARIES(OTBCommon ${MAPNIK_LIBRARY})
ENDIF(OTB_USE_MAPNIK)
IF(OTB_USE_PQXX)
#TODO this line should be refined when we will like to have this capability with windows
TARGET_LINK_LIBRARIES(OTBCommon ${PQ_LIBRARY} ${PQXX_LIBRARY})
ENDIF(OTB_USE_PQXX)
......
......@@ -4,7 +4,7 @@ FILE(GLOB OTBGeospatialAnalysis_SRCS "*.cxx" )
ADD_LIBRARY(OTBGeospatialAnalysis ${OTBGeospatialAnalysis_SRCS})
TARGET_LINK_LIBRARIES (OTBGeospatialAnalysis OTBCommon pq pqxx)
TARGET_LINK_LIBRARIES (OTBGeospatialAnalysis OTBCommon ${PQ_LIBRARY} ${PQXX_LIBRARY})
IF(OTB_LIBRARY_PROPERTIES)
SET_TARGET_PROPERTIES(OTBGeospatialAnalysis PROPERTIES ${OTB_LIBRARY_PROPERTIES})
ENDIF(OTB_LIBRARY_PROPERTIES)
......
......@@ -30,7 +30,11 @@ ENDIF(OTB_COMPILE_JPEG2000)
ADD_LIBRARY(OTBIO ${OTBIO_SRCS})
TARGET_LINK_LIBRARIES (OTBIO ${GDAL_LIBRARY} ${OGR_LIBRARY} OTBCommon)
SET_TARGET_PROPERTIES(OTBIO
PROPERTIES
LINK_INTERFACE_LIBRARIES ""
)
TARGET_LINK_LIBRARIES (OTBIO ${GDAL_LIBRARY} ${OGR_LIBRARY} ${JPEG_LIBRARY} ${TIFF_LIBRARY} ${GEOTIFF_LIBRARY} OTBCommon)
TARGET_LINK_LIBRARIES (OTBIO otbossim otbossimplugins ITKIO ITKCommon dxf otbkml)
IF (OTB_USE_LIBLAS)
......@@ -70,10 +74,10 @@ IF(NOT OTB_COMPILE_JPEG2000)
ENDIF(NOT OTB_COMPILE_JPEG2000)
# Compile otbTestDriver
# Nedded in the OTB-Wrapping project.
# Needed in the OTB-Wrapping project.
# Has to be compiled even if the BUILD_TEST are set to OFF
IF(CMAKE_COMPILER_IS_GNUCXX)
SET_SOURCE_FILES_PROPERTIES(itkTestDriver.cxx PROPERTIES COMPILE_FLAGS -w)
SET_SOURCE_FILES_PROPERTIES(otbTestDriver.cxx PROPERTIES COMPILE_FLAGS -w)
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
ADD_EXECUTABLE(otbTestDriver otbTestDriver.cxx)
......
......@@ -3,6 +3,10 @@
FILE(GLOB OTBTesting_SRCS "*.cxx" )
ADD_LIBRARY(OTBTesting ${OTBTesting_SRCS})
SET_TARGET_PROPERTIES(OTBTesting
PROPERTIES
LINK_INTERFACE_LIBRARIES ""
)
TARGET_LINK_LIBRARIES (OTBTesting OTBBasicFilters OTBIO OTBCommon ITKBasicFilters)
IF(OTB_LIBRARY_PROPERTIES)
SET_TARGET_PROPERTIES(OTBTesting PROPERTIES ${OTB_LIBRARY_PROPERTIES})
......
......@@ -29,7 +29,6 @@ void RegisterTests()
{
REGISTER_TEST(otbLeeFilter);
REGISTER_TEST(otbFrostFilterNew);
// REGISTER_TEST(otbFrostFilterTest);
REGISTER_TEST(otbFrostFilter);
REGISTER_TEST(otbImageToPointSetFilterTest);
REGISTER_TEST(otbOpeningClosingMorphologicalFilterNew);
......
......@@ -457,6 +457,17 @@ ADD_TEST(prTvVectorDataProjectionFilterFromMapToGeo ${PROJECTIONS_TESTS3}
${TEMP}/prTvVectorDataProjectionFilterFromMapToGeo.kml
)
ADD_TEST(prTvVectorDataProjectionFilterFromMapToImage ${PROJECTIONS_TESTS3}
--compare-ascii ${NOTOL}
${BASELINE_FILES}/prTvVectorDataProjectionFilterFromMapToImage.kml
${TEMP}/prTvVectorDataProjectionFilterFromMapToImage.kml
otbVectorDataProjectionFilterFromMapToImage
${INPUTDATA}/ToulousePoints-examples.shp
${INPUTDATA}/QB_Toulouse_Ortho_PAN.tif
${TEMP}/prTvVectorDataProjectionFilterFromMapToImage.kml
)
ADD_TEST(prTuGeocentricTransformNew ${PROJECTIONS_TESTS3} otbGeocentricTransformNew )
......@@ -509,6 +520,7 @@ otbVectorDataProjectionFilterNew.cxx
otbVectorDataProjectionFilter.cxx
otbVectorDataProjectionFilterFromMapToSensor.cxx
otbVectorDataProjectionFilterFromMapToGeo.cxx
otbVectorDataProjectionFilterFromMapToImage.cxx
otbGeocentricTransformNew.cxx
otbGeocentricTransform.cxx
otbVectorDataExtractROIandProjection.cxx
......
......@@ -37,6 +37,7 @@ void RegisterTests()
REGISTER_TEST(otbVectorDataProjectionFilter);
REGISTER_TEST(otbVectorDataProjectionFilterFromMapToSensor);
REGISTER_TEST(otbVectorDataProjectionFilterFromMapToGeo);
REGISTER_TEST(otbVectorDataProjectionFilterFromMapToImage);
REGISTER_TEST(otbGeocentricTransformNew);
REGISTER_TEST(otbGeocentricTransform);
REGISTER_TEST(otbVectorDataExtractROIandProjection);
......
/*=========================================================================
Program: ORFEO Toolbox
Language: C++
Date: $Date$
Version: $Revision$
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "itkExceptionObject.h"
#include "otbVectorDataProjectionFilter.h"
#include "otbVectorData.h"
#include "otbVectorDataFileReader.h"
#include "otbVectorDataFileWriter.h"
#include "otbImage.h"
#include "otbImageFileReader.h"
int otbVectorDataProjectionFilterFromMapToImage(int argc, char * argv[])
{
if (argc < 4 )
{
std::cout << argv[0] <<" <input vector filename> <input image filename>"
<< " <output vector filename> " << std::endl;
return EXIT_FAILURE;
}
typedef otb::VectorData<double > InputVectorDataType;
typedef otb::VectorData<double > OutputVectorDataType;
typedef otb::VectorDataFileReader<InputVectorDataType> VectorDataFileReaderType;
VectorDataFileReaderType::Pointer reader = VectorDataFileReaderType::New();
reader->SetFileName(argv[1]);
reader->UpdateOutputInformation();
typedef otb::Image<unsigned short int, 2> ImageType;
typedef otb::ImageFileReader<ImageType> ImageReaderType;
ImageReaderType::Pointer imageReader = ImageReaderType::New();
imageReader->SetFileName(argv[2]);
imageReader->UpdateOutputInformation();
typedef otb::VectorDataProjectionFilter<InputVectorDataType,OutputVectorDataType> VectorDataFilterType;
VectorDataFilterType::Pointer vectorDataProjection = VectorDataFilterType::New();
vectorDataProjection->SetInput(reader->GetOutput());
vectorDataProjection->SetOutputProjectionRef(imageReader->GetOutput()->GetProjectionRef());
vectorDataProjection->SetOutputOrigin(imageReader->GetOutput()->GetOrigin());
vectorDataProjection->SetOutputSpacing(imageReader->GetOutput()->GetSpacing());
typedef otb::VectorDataFileWriter<OutputVectorDataType> VectorDataFileWriterType;
VectorDataFileWriterType::Pointer writer = VectorDataFileWriterType::New();
writer->SetFileName(argv[3]);
writer->SetInput(vectorDataProjection->GetOutput());
writer->Update();
return EXIT_SUCCESS;
}
......@@ -2,7 +2,7 @@ PROJECT(dxflib)
FILE(GLOB dxflib_SRCS "*.cpp")
ADD_LIBRARY(dxf ${dxflib_SRCS})
TARGET_LINK_LIBRARIES(dxf)
IF(OTB_LIBRARY_PROPERTIES)
SET_TARGET_PROPERTIES(dxf PROPERTIES ${OTB_LIBRARY_PROPERTIES})
ENDIF(OTB_LIBRARY_PROPERTIES)
......
......@@ -5,7 +5,6 @@ FILE(GLOB otbconfigfilelib_HDRS "ConfigFile.h")
ADD_LIBRARY(otbconfigfile ${otbconfigfilelib_SRCS} )
TARGET_LINK_LIBRARIES(otbconfigfile )
IF(OTB_LIBRARY_PROPERTIES)
SET_TARGET_PROPERTIES(otbconfigfile PROPERTIES ${OTB_LIBRARY_PROPERTIES})
ENDIF(OTB_LIBRARY_PROPERTIES)
......
......@@ -139,9 +139,15 @@ IF(NOT OTB_DISABLE_UTILITIES_COMPILATION)
${ossim_projection_SRCS}
${ossim_imaging_SRCS}
${ossim_parallel_SRCS}
${ossim_elevation_SRCS}
${ossim_elevation_SRCS})
SET_TARGET_PROPERTIES(otbossim
PROPERTIES
LINK_INTERFACE_LIBRARIES ""
)
TARGET_LINK_LIBRARIES(otbossim ${TIFF_LIBRARY} ${GEOTIFF_LIBRARY} ${JPEG_LIBRARY} ${OPENTHREADS_LIBRARY})
# TARGET_LINK_LIBRARIES(otbossim ${GDAL_LIBRARY})#To make sure that gdal appear before geotiff
# TARGET_LINK_LIBRARIES(otbossim ${JPEG_LIBRARY} ${TIFF_LIBRARY} ${GEOTIFF_LIBRARY} ${OPENTHREADS_LIBRARY})
TARGET_LINK_LIBRARIES(otbossim ${OPENTHREADS_LIBRARY})
IF(NOT OTB_INSTALL_NO_LIBRARIES)
INSTALL(TARGETS otbossim
......
......@@ -23,9 +23,8 @@ SET(ossimplugins_SOURCES
${ossimplugins_ossim_SRCS}
)
ADD_LIBRARY(otbossimplugins ${ossimplugins_SOURCES} )
TARGET_LINK_LIBRARIES(otbossimplugins ${GDAL_LIBRARY} otbossim)
#TARGET_LINK_LIBRARIES(otbossimplugins ${GDAL_LIBRARY} otbossim)
IF(OTB_LIBRARY_PROPERTIES)
SET_TARGET_PROPERTIES(otbossimplugins PROPERTIES ${OTB_LIBRARY_PROPERTIES})
ENDIF(OTB_LIBRARY_PROPERTIES)
......
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