diff --git a/Examples/Projections/CMakeLists.txt b/Examples/Projections/CMakeLists.txt index 66e5b2a36ca040504557e9654897e918cfba0d3f..f77ba6798e19e187d830020f3eb91b76aa2bb3f1 100644 --- a/Examples/Projections/CMakeLists.txt +++ b/Examples/Projections/CMakeLists.txt @@ -40,6 +40,7 @@ ENDIF(OTB_DATA_USE_LARGEINPUT) SET(TEMP ${OTB_BINARY_DIR}/Testing/Temporary) SET(EXE_TESTS ${CXX_TEST_PATH}/otbProjectionsExamplesTests) +SET(EXE_TESTS2 ${CXX_TEST_PATH}/otbProjectionsExamplesTests2) SET(TOL 0.0) @@ -102,18 +103,21 @@ ADD_TEST(VectorDataProjectionExampleTest ${EXE_TESTS} ENDIF(OTB_DATA_USE_LARGEINPUT) IF( OTB_USE_CURL ) -ADD_TEST(PlaceNameToLonLatExampleTest ${EXE_TESTS} +ADD_TEST(PlaceNameToLonLatExampleTest ${EXE_TESTS2} PlaceNameToLonLatExampleTest Toulouse ) ENDIF( OTB_USE_CURL ) + +ADD_EXECUTABLE(otbProjectionsExamplesTests otbProjectionsExamplesTests.cxx) +TARGET_LINK_LIBRARIES(otbProjectionsExamplesTests OTBCommon OTBIO OTBProjections) + IF( OTB_USE_CURL ) - ADD_EXECUTABLE(otbProjectionsExamplesTests otbProjectionsExamplesTests.cxx) - TARGET_LINK_LIBRARIES(otbProjectionsExamplesTests OTBCommon OTBIO OTBProjections ${CURL_LIBRARY} tinyXML) -ELSE( OTB_USE_CURL ) - ADD_EXECUTABLE(otbProjectionsExamplesTests otbProjectionsExamplesTests.cxx) - TARGET_LINK_LIBRARIES(otbProjectionsExamplesTests OTBCommon OTBIO OTBProjections) + ADD_EXECUTABLE(otbProjectionsExamplesTests2 otbProjectionsExamplesTests2.cxx) + TARGET_LINK_LIBRARIES(otbProjectionsExamplesTests2 OTBCommon OTBIO OTBProjections ${CURL_LIBRARY} tinyXML) ENDIF( OTB_USE_CURL ) + + ENDIF( NOT OTB_DISABLE_CXX_TESTING AND BUILD_TESTING ) diff --git a/Examples/Projections/otbProjectionsExamplesTests.cxx b/Examples/Projections/otbProjectionsExamplesTests.cxx index 57df32860016d74f38f18eb2e272cd4bd646602d..74304f2b863eb79d01c343f727541b694496a625 100644 --- a/Examples/Projections/otbProjectionsExamplesTests.cxx +++ b/Examples/Projections/otbProjectionsExamplesTests.cxx @@ -29,7 +29,6 @@ void RegisterTests() REGISTER_TEST(OrthoRectificationExampleTest); REGISTER_TEST(MapProjectionExampleTest); REGISTER_TEST(VectorDataProjectionExampleTest); - REGISTER_TEST(PlaceNameToLonLatExampleTest); } #undef main @@ -44,6 +43,4 @@ void RegisterTests() #define main VectorDataProjectionExampleTest #include "VectorDataProjectionExample.cxx" -#undef main -#define main PlaceNameToLonLatExampleTest -#include "PlaceNameToLonLatExample.cxx" + diff --git a/Examples/Projections/otbProjectionsExamplesTests2.cxx b/Examples/Projections/otbProjectionsExamplesTests2.cxx new file mode 100644 index 0000000000000000000000000000000000000000..21d54433898eb24758fa45c760dedd56e2f6a979 --- /dev/null +++ b/Examples/Projections/otbProjectionsExamplesTests2.cxx @@ -0,0 +1,35 @@ + +/*========================================================================= + + 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. + +=========================================================================*/ + +// this file defines the otbMultiScaleTest for the test driver +// and all it expects is that you have a function called RegisterTests +#if defined(_MSC_VER) +#pragma warning ( disable : 4786 ) +#endif +#include <iostream> +#include "otbTestMain.h" + +void RegisterTests() +{ + REGISTER_TEST(PlaceNameToLonLatExampleTest); +} + + +#undef main +#define main PlaceNameToLonLatExampleTest +#include "PlaceNameToLonLatExample.cxx"