Commit ef14ce49 authored by Emmanuel Christophe's avatar Emmanuel Christophe
Browse files

ENH: adding WKT output in otbMapProjection (related to bug 58)

parent a04c09fc
......@@ -497,7 +497,7 @@ ENDIF(OTB_USE_VISU_GUI)
# Use OTB_ALLS_UTILITIES_DEPENDENT_LIBRARIES to LINK Utilities Algo libraries into your executable
# => Create OTB_IO_UTILITIES_DEPENDENT_LIBRARIES
SET(OTB_IO_UTILITIES_DEPENDENT_LIBRARIES "gdal;dxf;tinyXML;otbgeotiff;otbxtiff;otbossim" )
SET(OTB_IO_UTILITIES_DEPENDENT_LIBRARIES "gdal;dxf;tinyXML;otbgeotiff;otbxtiff;otbliblas;otbossim;otbossimplugins" )
IF(NOT OTB_USE_EXTERNAL_OPENTHREADS)
SET(OTB_IO_UTILITIES_DEPENDENT_LIBRARIES "${OTB_IO_UTILITIES_DEPENDENT_LIBRARIES};${OPENTHREADS_LIBRARY}")
......
FILE(GLOB OTBProjections_SRCS "*.cxx" )
ADD_LIBRARY(OTBProjections ${OTBProjections_SRCS})
TARGET_LINK_LIBRARIES(OTBProjections OTBIO)
TARGET_LINK_LIBRARIES(OTBProjections OTBIO otbossimplugins)
IF( OTB_USE_CURL )
TARGET_LINK_LIBRARIES (OTBProjections ${CURL_LIBRARY})
ENDIF( OTB_USE_CURL )
......
......@@ -31,7 +31,7 @@ PURPOSE. See the above copyright notices for more information.
#include "base/ossimEllipsoid.h"
#include "base/ossimEllipsoidFactory.h"
#include "base/ossimString.h"
#include "ossimOgcWktTranslator.h"
namespace otb
{
......@@ -112,7 +112,10 @@ namespace otb
//virtual void SetMatrix(double rotation, const OutputPointType &scale, const OutputPointType &translation);
void SetFalseEasting(double falseEasting);
virtual void PrintMap() const ;
virtual std::string GetWkt() const;
virtual void PrintMap() const;
protected:
MapProjection();
......
......@@ -357,6 +357,20 @@ namespace otb
metersPerPixel[1]=ossimMetersPerPixel.y;
}
template<class TOssimMapProjection, InverseOrForwardTransformationEnum Transform, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions>
std::string
MapProjection<TOssimMapProjection, Transform, TScalarType, NInputDimensions, NOutputDimensions>
::GetWkt() const
{
ossimKeywordlist kwl;
m_MapProjection->saveState(kwl);
ossimOgcWktTranslator wktTranslator;
std::string wkt;
wkt = wktTranslator.fromOssimKwl(kwl);
return wkt;
}
template<class TOssimMapProjection, InverseOrForwardTransformationEnum Transform, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions>
void
MapProjection<TOssimMapProjection, Transform, TScalarType, NInputDimensions, NOutputDimensions>
......
......@@ -18,7 +18,7 @@ SET(PROJECTIONS_TESTS1 ${CXX_TEST_PATH}/otbProjectionsTests1)
SET(PROJECTIONS_TESTS2 ${CXX_TEST_PATH}/otbProjectionsTests2)
SET(PROJECTIONS_TESTS3 ${CXX_TEST_PATH}/otbProjectionsTests3)
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ otbPROJECTIONS_TESTS1 ~~~~~~~~~~~~~~~~~~~~~~~~~~
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
......@@ -33,43 +33,43 @@ ADD_TEST(prTuSensorModelsNew ${PROJECTIONS_TESTS1} otbSensorModelsNew )
# TEST 4
IF(OTB_DATA_USE_LARGEINPUT)
ADD_TEST(prTvTestCreateProjectionWithOSSIM_Toulouse ${PROJECTIONS_TESTS1}
ADD_TEST(prTvTestCreateProjectionWithOSSIM_Toulouse ${PROJECTIONS_TESTS1}
otbCreateProjectionWithOSSIM
${IMAGEDATA}/TOULOUSE/QuickBird/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF
)
# TEST 5
ADD_TEST(prTvTestCreateProjectionWithOSSIM_Cevennes ${PROJECTIONS_TESTS1}
ADD_TEST(prTvTestCreateProjectionWithOSSIM_Cevennes ${PROJECTIONS_TESTS1}
otbCreateProjectionWithOSSIM
${IMAGEDATA}/CEVENNES/06FEB12104912-P1BS-005533998070_01_P001.TIF
)
# TEST 6
ADD_TEST(prTvTestCreateProjectionWithOTB_Toulouse ${PROJECTIONS_TESTS1}
ADD_TEST(prTvTestCreateProjectionWithOTB_Toulouse ${PROJECTIONS_TESTS1}
otbCreateProjectionWithOTB
${IMAGEDATA}/TOULOUSE/QuickBird/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF
)
# TEST 7
ADD_TEST(prTvTestCreateProjectionWithOTB_Cevennes ${PROJECTIONS_TESTS1}
ADD_TEST(prTvTestCreateProjectionWithOTB_Cevennes ${PROJECTIONS_TESTS1}
otbCreateProjectionWithOTB
${IMAGEDATA}/CEVENNES/06FEB12104912-P1BS-005533998070_01_P001.TIF
)
# TEST 8
ADD_TEST(prTvTestCreateInverseForwardSensorModel_Toulouse ${PROJECTIONS_TESTS1}
ADD_TEST(prTvTestCreateInverseForwardSensorModel_Toulouse ${PROJECTIONS_TESTS1}
otbCreateInverseForwardSensorModel
${IMAGEDATA}/TOULOUSE/QuickBird/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF
)
# TEST 9
ADD_TEST(prTvTestCreateInverseForwardSensorModel_Cevennes ${PROJECTIONS_TESTS1}
ADD_TEST(prTvTestCreateInverseForwardSensorModel_Cevennes ${PROJECTIONS_TESTS1}
otbCreateInverseForwardSensorModel
${IMAGEDATA}/CEVENNES/06FEB12104912-P1BS-005533998070_01_P001.TIF
)
#=======================================================================================
# TEST 10
# ADD_TEST(prTvRegionProjectionToulouse ${PROJECTIONS_TESTS1}
# ADD_TEST(prTvRegionProjectionToulouse ${PROJECTIONS_TESTS1}
# --compare-image ${TOL} ${BASELINE}/prTvRegionProjectionToulouse.tif
# ${TEMP}/prTvRegionProjectionToulouse.tif
# otbRegionProjection
......@@ -83,13 +83,13 @@ ADD_TEST(prTvTestCreateInverseForwardSensorModel_Cevennes ${PROJECTIONS_TESTS1}
# -0.00001
# )
# TEST 11
# ADD_TEST(prTvRegionProjectionCevennes ${PROJECTIONS_TESTS1}
# ADD_TEST(prTvRegionProjectionCevennes ${PROJECTIONS_TESTS1}
# --compare-image ${TOL} ${BASELINE}/prTvRegionProjectionCevennes.tif
# ${TEMP}/prTvRegionProjectionCevennes.tif
# otbRegionProjection
# ${IMAGEDATA}/CEVENNES/06FEB12104912-P1BS-005533998070_01_P001.TIF
# ${TEMP}/prTvRegionProjectionCevennes.tif
# 3.7 44.08
# 3.7 44.08
# 500
# 500
# 10
......@@ -98,7 +98,7 @@ ADD_TEST(prTvTestCreateInverseForwardSensorModel_Cevennes ${PROJECTIONS_TESTS1}
# )
#=======================================================================================
# TEST 12
ADD_TEST(prTvRegionProjectionResamplerToulouse ${PROJECTIONS_TESTS1}
ADD_TEST(prTvRegionProjectionResamplerToulouse ${PROJECTIONS_TESTS1}
--compare-image ${EPSILON} ${BASELINE}/prTvRegionProjectionResamplerToulouse.tif
${TEMP}/prTvRegionProjectionResamplerToulouse.tif
otbRegionProjectionResampler
......@@ -110,9 +110,9 @@ ADD_TEST(prTvRegionProjectionResamplerToulouse ${PROJECTIONS_TESTS1}
100
0.00001
-0.00001
)
# TEST 13
ADD_TEST(prTvRegionProjectionResamplerCevennes ${PROJECTIONS_TESTS1}
)
# TEST 13
ADD_TEST(prTvRegionProjectionResamplerCevennes ${PROJECTIONS_TESTS1}
--compare-image ${EPSILON} ${BASELINE}/prTvRegionProjectionResamplerCevennes.tif
${TEMP}/prTvRegionProjectionResamplerCevennes.tif
otbRegionProjectionResampler
......@@ -126,38 +126,38 @@ ADD_TEST(prTvRegionProjectionResamplerCevennes ${PROJECTIONS_TESTS1}
-0.00001
)
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ otbPROJECTIONS_TESTS2 ~~~~~~~~~~~~~~~~~~~~~~~~~~
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
#=======================================================================================
# TEST 14
#ADD_TEST(prTvSensorImageToCartoToulouse ${PROJECTIONS_TESTS2}
#ADD_TEST(prTvSensorImageToCartoToulouse ${PROJECTIONS_TESTS2}
# --compare-image ${TOL} ${BASELINE}/prTvSensorImageToCartoToulouse_UTM.tif
# ${TEMP}/prTvSensorImageToCartoToulouse_UTM.tif
# otbSensorImageToCarto
# ${IMAGEDATA}/TOULOUSE/QuickBird/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF
# ${IMAGEDATA}/TOULOUSE/QuickBird/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF
# ${TEMP}/prTvSensorImageToCartoToulouse_UTM.tif
# 374100.8
# 4829184.8
# 4829184.8
# 500
# 500
# 500
# 220
# 0.5
# -0.5
# )
# TEST 15
#ADD_TEST(prTvSensorImageToCartoCevennes ${PROJECTIONS_TESTS2}
#ADD_TEST(prTvSensorImageToCartoCevennes ${PROJECTIONS_TESTS2}
# --compare-image ${TOL} ${BASELINE}/prTvSensorImageToCartoCevennes_UTM.tif
# ${TEMP}/prTvSensorImageToCartoCevennes_UTM.tif
# otbSensorImageToCarto
# ${IMAGEDATA}/CEVENNES/06FEB12104912-P1BS-005533998070_01_P001.TIF
# ${TEMP}/prTvSensorImageToCartoCevennes_UTM.tif
# 556046
# 4.881e+06
# 500
# 500
# 556046
# 4.881e+06
# 500
# 500
# 220
# 0.5
# -0.5
......@@ -166,23 +166,23 @@ ADD_TEST(prTvRegionProjectionResamplerCevennes ${PROJECTIONS_TESTS1}
ENDIF(OTB_DATA_USE_LARGEINPUT)
# TU pour otb::OrthoRectificationFilterBase otb::OrthoRectificationFilter
ADD_TEST(prTuOrthoRectificationFilterNew ${PROJECTIONS_TESTS2}
# TU pour otb::OrthoRectificationFilterBase otb::OrthoRectificationFilter
ADD_TEST(prTuOrthoRectificationFilterNew ${PROJECTIONS_TESTS2}
otbOrthoRectificationFilterNew )
# TEST 16.2
IF(OTB_DATA_USE_LARGEINPUT)
ADD_TEST(prTvOrthoRectificationToulouse ${PROJECTIONS_TESTS2}
ADD_TEST(prTvOrthoRectificationToulouse ${PROJECTIONS_TESTS2}
--compare-image ${EPSILON} ${BASELINE}/prTvOrthoRectificationToulouse_UTM.tif
${TEMP}/prTvOrthoRectificationToulouse_UTM.tif
otbOrthoRectificationFilter
${IMAGEDATA}/TOULOUSE/QuickBird/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF
${TEMP}/prTvOrthoRectificationToulouse_UTM.tif
374100.8
4829184.8
4829184.8
500
500
500
# 220
0.5
-0.5
......@@ -191,101 +191,101 @@ ADD_TEST(prTvOrthoRectificationToulouse ${PROJECTIONS_TESTS2}
)
# TEST 17
ADD_TEST(prTvOrthoRectificationCevennes ${PROJECTIONS_TESTS2}
ADD_TEST(prTvOrthoRectificationCevennes ${PROJECTIONS_TESTS2}
--compare-image ${EPSILON} ${BASELINE}/prTvOrthoRectificationCevennes_UTM.tif
${TEMP}/prTvOrthoRectificationCevennes_UTM.tif
otbOrthoRectificationFilter
${IMAGEDATA}/CEVENNES/06FEB12104912-P1BS-005533998070_01_P001.TIF
${TEMP}/prTvOrthoRectificationCevennes_UTM.tif
556046
4.881e+06
556046
4.881e+06
500
500
500
# 220
0.5
-0.5
31
N
)
#=======================================================================================
#=======================================================================================
# TEST 18
#ADD_TEST(prTvSensorImageDEMToCartoToulouse ${PROJECTIONS_TESTS2}
#ADD_TEST(prTvSensorImageDEMToCartoToulouse ${PROJECTIONS_TESTS2}
# --compare-image ${TOL} ${BASELINE}/prTvSensorImageDEMToCartoToulouse_UTM.tif
# ${TEMP}/prTvSensorImageDEMToCartoToulouse_UTM.tif
# otbSensorImageDEMToCarto
# ${IMAGEDATA}/TOULOUSE/QuickBird/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF
# ${TEMP}/prTvSensorImageDEMToCartoToulouse_UTM.tif
# 374100.8
# 4829184.8
# 4829184.8
# 500
# 500
# 500
# 220
# ${INPUTDATA}/DEM/srtm_directory/
# ${INPUTDATA}/DEM/srtm_directory/
# 0.5
# -0.5
# )
# TEST 19
#ADD_TEST(prTvSensorImageDEMToCartoCevennes ${PROJECTIONS_TESTS2}
#ADD_TEST(prTvSensorImageDEMToCartoCevennes ${PROJECTIONS_TESTS2}
# --compare-image ${TOL} ${BASELINE}/prTvSensorImageDEMToCartoCevennes_UTM.tif
# ${TEMP}/prTvSensorImageDEMToCartoCevennes_UTM.tif
# otbSensorImageDEMToCarto
# ${IMAGEDATA}/CEVENNES/06FEB12104912-P1BS-005533998070_01_P001.TIF
# ${TEMP}/prTvSensorImageDEMToCartoCevennes_UTM.tif
# 556046
# 4.881e+06
# 500
# 500
# 200
# ${INPUTDATA}/DEM/srtm_directory/
# 556046
# 4.881e+06
# 500
# 500
# 200
# ${INPUTDATA}/DEM/srtm_directory/
# 0.5
# -0.5
# )
#=======================================================================================
# TEST 20.2
ADD_TEST(prTvOrthoRectificationToulouseWithDEM ${PROJECTIONS_TESTS2}
ADD_TEST(prTvOrthoRectificationToulouseWithDEM ${PROJECTIONS_TESTS2}
--compare-image ${EPSILON} ${BASELINE}/prTvOrthoRectificationToulouseWithDEM_UTM.tif
${TEMP}/prTvOrthoRectificationToulouseWithDEM_UTM.tif
otbOrthoRectificationFilterWithDEM
otbOrthoRectificationFilterWithDEM
${IMAGEDATA}/TOULOUSE/QuickBird/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF
${TEMP}/prTvOrthoRectificationToulouseWithDEM_UTM.tif
374100.8
4829184.8
4829184.8
500
500
500
# 220
0.5
-0.5
31
N
${INPUTDATA}/DEM/srtm_directory/
${INPUTDATA}/DEM/srtm_directory/
# ${TEMP}/prTvOrthoRectificationToulouseWithDEM_UTM.tif
)
# TEST 21
ADD_TEST(prTvOrthoRectificationCevennesWithDEM ${PROJECTIONS_TESTS2}
ADD_TEST(prTvOrthoRectificationCevennesWithDEM ${PROJECTIONS_TESTS2}
--compare-image ${EPSILON} ${BASELINE}/prTvOrthoRectificationCevennesWithDEM_UTM.tif
${TEMP}/prTvOrthoRectificationCevennesWithDEM_UTM.tif
otbOrthoRectificationFilterWithDEM
${IMAGEDATA}/CEVENNES/06FEB12104912-P1BS-005533998070_01_P001.TIF
${TEMP}/prTvOrthoRectificationCevennesWithDEM_UTM.tif
556046
4.881e+06
500
500
# 200
556046
4.881e+06
500
500
# 200
0.5
-0.5
31
N
${INPUTDATA}/DEM/srtm_directory/
${INPUTDATA}/DEM/srtm_directory/
# ${TEMP}/prTvOrthoRectificationCevennesWithDEM_UTM.tif
)
#========================= Ortho rectif SPOT5 ===============================
#========================= Ortho rectif SPOT5 ===============================
ADD_TEST(prTvOrthoRectificationSPOT5 ${PROJECTIONS_TESTS2}
ADD_TEST(prTvOrthoRectificationSPOT5 ${PROJECTIONS_TESTS2}
--compare-image ${EPSILON} ${BASELINE}/prTvOrthoRectificationSPOT5_UTM.tif
${TEMP}/prTvOrthoRectificationSPOT5_UTM.tif
otbOrthoRectificationFilter
......@@ -294,14 +294,14 @@ ADD_TEST(prTvOrthoRectificationSPOT5 ${PROJECTIONS_TESTS2}
536187
3950748
500
500
500
5
-5
39
N
)
ADD_TEST(prTvOrthoRectificationMonoThreadSPOT5 ${PROJECTIONS_TESTS2}
)
ADD_TEST(prTvOrthoRectificationMonoThreadSPOT5 ${PROJECTIONS_TESTS2}
--compare-image ${EPSILON} ${BASELINE}/prTvOrthoRectificationSPOT5_UTM.tif
${TEMP}/prTvOrthoRectificationMonoThreadSPOT5_UTM.tif
otbOrthoRectificationMonoThreadFilter
......@@ -310,7 +310,7 @@ ADD_TEST(prTvOrthoRectificationSPOT5 ${PROJECTIONS_TESTS2}
536187
3950748
500
500
500
5
-5
39
......@@ -322,7 +322,7 @@ ENDIF(OTB_DATA_USE_LARGEINPUT)
#SET(EMMANUELDATA ${OTB_DATA_ROOT}/Emmanuel/Singapour/000000173549_01_P001_MUL)
# TEST 22
#ADD_TEST(prTvRegionProjectionResamplerSingapour ${PROJECTIONS_TESTS2}
#ADD_TEST(prTvRegionProjectionResamplerSingapour ${PROJECTIONS_TESTS2}
# otbRegionProjectionResampler
# ${EMMANUELDATA}/04MAR21031747-M1BS-000000173549_01_P001.TIF
# ${TEMP}/prTvRegionProjectionResamplerSingapour.tif
......@@ -335,20 +335,20 @@ ENDIF(OTB_DATA_USE_LARGEINPUT)
# )
# TEST 23
#ADD_TEST(prTvOrthoRectificationSingapour ${PROJECTIONS_TESTS2}
#ADD_TEST(prTvOrthoRectificationSingapour ${PROJECTIONS_TESTS2}
# otbOrthoRectificationFilter
# ${EMMANUELDATA}/04MAR21031747-M1BS-000000173549_01_P001.TIF
# ${TEMP}/prTvOrthoRectificationSingapour_UTM.tif
# 371997.12 144885.4
# 500
# 500
# 500
# 220
# 1
# -1
# )
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ otbPROJECTIONS_TESTS3 ~~~~~~~~~~~~~~~~~~~~~~~~~~
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
......@@ -356,6 +356,7 @@ ENDIF(OTB_DATA_USE_LARGEINPUT)
SET(Projections_SRCS1
otbProjectionBaseNew.cxx
otbMapProjectionsNew.cxx
otbMapProjection.cxx
otbSensorModelsNew.cxx
otbCreateProjectionWithOSSIM.cxx
otbCreateProjectionWithOTB.cxx
......
/*=========================================================================
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 "otbMacro.h"
#include "otbImage.h"
#include "otbMapProjections.h"
int otbMapProjection( int argc, char* argv[] )
{
otb::UtmInverseProjection::Pointer lUtmProjection = otb::UtmInverseProjection::New();
std::cout << lUtmProjection->GetWkt() << std::endl;
return EXIT_SUCCESS;
}
\ No newline at end of file
......@@ -29,6 +29,7 @@ void RegisterTests()
{
REGISTER_TEST(otbProjectionBaseNew);
REGISTER_TEST(otbMapProjectionsNew);
REGISTER_TEST(otbMapProjection);
REGISTER_TEST(otbSensorModelsNew);
REGISTER_TEST(otbCreateProjectionWithOSSIM);
REGISTER_TEST(otbCreateProjectionWithOTB);
......
......@@ -25,9 +25,9 @@ IF(NOT OTB_USE_EXTERNAL_EXPAT)
SUBDIRS( otbexpat )
ENDIF(NOT OTB_USE_EXTERNAL_EXPAT)
#Supress libraries not used by the 2.2.0 version
#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 otbkml otbliblas otbedison)
SUBDIRS(BGL otbsvm dxflib InsightJournal otbossim otbossimplugins otb6S otbgeotiff tinyXMLlib otbkml otbliblas otbedison)
IF(BUILD_TESTING)
SUBDIRS( Dart )
......
......@@ -31,6 +31,7 @@ SET(OTB_INCLUDE_DIRS_BUILD_TREE ${OTB_INCLUDE_DIRS_BUILD_TREE}
${OTB_SOURCE_DIR}/Utilities/otbossim
${OTB_SOURCE_DIR}/Utilities/otbossim/include
${OTB_SOURCE_DIR}/Utilities/otbossim/include/ossim
${OTB_SOURCE_DIR}/Utilities/otbossimplugins
${OTB_SOURCE_DIR}/Utilities/dxflib
${OTB_SOURCE_DIR}/Utilities/InsightJournal
${OTB_SOURCE_DIR}/Utilities/otb6S
......@@ -48,10 +49,10 @@ SET(OTB_INCLUDE_DIRS_BUILD_TREE ${OTB_INCLUDE_DIRS_BUILD_TREE}
${OTB_SOURCE_DIR}/Utilities/otbedison/segm
${OTB_SOURCE_DIR}/Utilities/otbedison/prompt
${OTB_SOURCE_DIR}/Utilities/otbedison/edge
)
IF(OTB_COMPILE_JPEG2000)
SET(OTB_INCLUDE_DIRS_BUILD_TREE ${OTB_INCLUDE_DIRS_BUILD_TREE}
SET(OTB_INCLUDE_DIRS_BUILD_TREE ${OTB_INCLUDE_DIRS_BUILD_TREE}
${OTB_SOURCE_DIR}/Utilities/otbopenjpeg
${OTB_SOURCE_DIR}/Utilities/otbopenjpeg/libopenjpeg)
ENDIF(OTB_COMPILE_JPEG2000)
......@@ -116,9 +117,9 @@ SET(OTB_INCLUDE_DIRS_BUILD_TREE_CXX ${OTB_INCLUDE_DIRS_BUILD_TREE_CXX} )
# INCLUDE(${FLTK_BINARY_DIR}/FLTKConfig.cmake)
# ENDIF(NOT EXISTS "${FLTK_BINARY_DIR}/FLTKConfig.cmake")
#ELSE(OTB_USE_EXTERNAL_FLTK)
# IF(EXISTS "${OTB_BINARY_DIR}/Utilities/FLTK/FLTKConfig.cmake")
# IF(EXISTS "${OTB_BINARY_DIR}/Utilities/FLTK/FLTKConfig.cmake")
# INCLUDE(${OTB_BINARY_DIR}/Utilities/FLTK/FLTKConfig.cmake)
# ENDIF(EXISTS "${OTB_BINARY_DIR}/Utilities/FLTK/FLTKConfig.cmake")
# ENDIF(EXISTS "${OTB_BINARY_DIR}/Utilities/FLTK/FLTKConfig.cmake")
#ENDIF(NOT OTB_USE_EXTERNAL_FLTK)
......@@ -154,7 +155,7 @@ ELSE(OTB_USE_EXTERNAL_EXPAT)
${OTB_SOURCE_DIR}/Utilities/otbexpat)
ENDIF(OTB_USE_EXTERNAL_EXPAT)
# For OpenThreads
# For OpenThreads
IF(NOT OTB_USE_EXTERNAL_OPENTHREADS)
SET(OTB_INCLUDE_DIRS_BUILD_TREE_CXX ${OTB_INCLUDE_DIRS_BUILD_TREE_CXX}
${OTB_SOURCE_DIR}/Utilities/otbopenthreads/OpenThreads/include
......@@ -168,7 +169,7 @@ IF(OTB_USE_EXTERNAL_ITK)
# ${ITK_INCLUDE_DIRS_INSTALL_TREE} )
ELSE(OTB_USE_EXTERNAL_ITK)
SET(OTB_INCLUDE_DIRS_BUILD_TREE_CXX ${OTB_INCLUDE_DIRS_BUILD_TREE_CXX}
${ITK_INCLUDE_DIRS_BUILD_TREE}
${ITK_INCLUDE_DIRS_BUILD_TREE}
${ITK_INCLUDE_DIRS_BUILD_TREE_CXX} )
ENDIF(OTB_USE_EXTERNAL_ITK)
......@@ -203,6 +204,7 @@ SET(OTB_INCLUDE_DIRS_INSTALL_TREE ${OTB_INCLUDE_DIRS_INSTALL_TREE}
${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbossim
${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbossim/include
${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbossim/include/ossim
${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbossimplugins
${OTB_INSTALL_INCLUDE_DIR}/Utilities/InsightJournal
${OTB_INSTALL_INCLUDE_DIR}/Utilities/otb6S
${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbgeotiff
......@@ -220,7 +222,7 @@ SET(OTB_INCLUDE_DIRS_INSTALL_TREE ${OTB_INCLUDE_DIRS_INSTALL_TREE}
)
IF(OTB_COMPILE_JPEG2000)
SET(OTB_INCLUDE_DIRS_INSTALL_TREE ${OTB_INCLUDE_DIRS_INSTALL_TREE}
SET(OTB_INCLUDE_DIRS_INSTALL_TREE ${OTB_INCLUDE_DIRS_INSTALL_TREE}
${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbopenjpeg
${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbopenjpeg/libopenjpeg)
ENDIF(OTB_COMPILE_JPEG2000)
......@@ -282,10 +284,10 @@ ENDIF(ITK_INCLUDE_DIRS_SYSTEM)
#THOMAS
SET(OTB_INCLUDE_DIRS_INSTALL_TREE ${OTB_INCLUDE_DIRS_INSTALL_TREE}
${ITK_INCLUDE_DIRS_INSTALL_TREE}
${ITK_INCLUDE_DIRS_INSTALL_TREE}
#JULIEN
${ITK_INCLUDE_DIRS}
)
# ${ITK_INCLUDE_DIRS_BUILD_TREE}
# ${ITK_INCLUDE_DIRS_BUILD_TREE}
# ${ITK_INCLUDE_DIRS_BUILD_TREE_CXX} )
ENDIF(OTB_USE_EXTERNAL_ITK)
Supports Markdown
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