Decoupage des exe de Fusion.

Testing/Code/Fusion/CMakeLists.txt

@@ -18,19 +18,23 @@ SET(EPS 0.001)
 #EPSILON est different de 0.0 pour les tests multiplateformes avec différentes options de compilation.
 SET(EPSILON 0.00000001)
 
-SET(FUSION_TESTS ${CXX_TEST_PATH}/otbFusionTests)
+SET(FUSION_TESTS1 ${CXX_TEST_PATH}/otbFusionTests1)
+SET(FUSION_TESTS2 ${CXX_TEST_PATH}/otbFusionTests2)
 
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ otbFusion1 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
 
 # -------            otb::ImageFusionBase   ------------------------------
-ADD_TEST(fuTuFusionImageBaseNew ${FUSION_TESTS}  
+ADD_TEST(fuTuFusionImageBaseNew ${FUSION_TESTS1}  
         otbFusionImageBaseNew
 )
 # -------            otb::BayesianFusionFilter   ------------------------------
-ADD_TEST(fuTuBayesianFusionFilterNew ${FUSION_TESTS}  
+ADD_TEST(fuTuBayesianFusionFilterNew ${FUSION_TESTS1}  
         otbBayesianFusionFilterNew
 )
 
-ADD_TEST(fuTvBayesianFusionFilter ${FUSION_TESTS} 
+ADD_TEST(fuTvBayesianFusionFilter ${FUSION_TESTS1} 
     --compare-image ${TOL}  ${BASELINE}/fuTvBayesianFusion.tif
                            ${TEMP}/fuTvBayesianFusion.tif
         otbBayesianFusionFilter
@@ -42,11 +46,11 @@ ADD_TEST(fuTvBayesianFusionFilter ${FUSION_TESTS}
 
 
 # -------    otb::SimpleRcsPanSharpeningFusionImageFilter   -------------------
-ADD_TEST(fuTuSimpleRcsPanSharpeningFusionImageFilterNew ${FUSION_TESTS}  
+ADD_TEST(fuTuSimpleRcsPanSharpeningFusionImageFilterNew ${FUSION_TESTS1}  
         otbSimpleRcsPanSharpeningFusionImageFilterNew
 )
 
-ADD_TEST(fuTvSimpleRcsPanSharpeningFusionImageFilter ${FUSION_TESTS} 
+ADD_TEST(fuTvSimpleRcsPanSharpeningFusionImageFilter ${FUSION_TESTS1} 
     --compare-image ${EPSILON}  ${BASELINE}/fuTvRcsPanSharpeningFusion.tif
                            ${TEMP}/fuTvRcsPanSharpeningFusion.tif
         otbSimpleRcsPanSharpeningFusionImageFilter
@@ -55,22 +59,28 @@ ADD_TEST(fuTvSimpleRcsPanSharpeningFusionImageFilter ${FUSION_TESTS}
 	${TEMP}/fuTvRcsPanSharpeningFusion.tif
 )
 
-
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ otbFusion2 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
         
 # A enrichir
-SET(Fusion_SRCS
+SET(Fusion_SRCS1
 otbFusionImageBaseNew.cxx
 otbBayesianFusionFilterNew.cxx
 otbBayesianFusionFilter.cxx
 otbSimpleRcsPanSharpeningFusionImageFilterNew.cxx
 otbSimpleRcsPanSharpeningFusionImageFilter.cxx
 )
+SET(Fusion_SRCS2
+)
 
 
 INCLUDE_DIRECTORIES("${OTBTesting_BINARY_DIR}")
 
-ADD_EXECUTABLE(otbFusionTests otbFusionTests.cxx ${Fusion_SRCS})
-TARGET_LINK_LIBRARIES(otbFusionTests  OTBFusion OTBCommon OTBIO gdal ITKIO ITKCommon ITKAlgorithms)
+ADD_EXECUTABLE(otbFusionTests1 otbFusionTests1.cxx ${Fusion_SRCS1})
+TARGET_LINK_LIBRARIES(otbFusionTests1  OTBFusion OTBCommon OTBIO gdal ITKIO ITKCommon ITKAlgorithms)
+ADD_EXECUTABLE(otbFusionTests2 otbFusionTests2.cxx ${Fusion_SRCS2})
+TARGET_LINK_LIBRARIES(otbFusionTests2  OTBFusion OTBCommon OTBIO gdal ITKIO ITKCommon ITKAlgorithms)
 
 
 ENDIF( NOT OTB_DISABLE_CXX_TESTING )

Testing/Code/Fusion/otbFusionTests2.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.
+
+=========================================================================*/
+
+// this file defines the otbCommonTest 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()
+{
+}