]> SALOME platform Git repositories - tools/medcoupling.git/commitdiff
Salome HOME
Fix make distcheck problems
authorinv <inv@opencascade.com>
Wed, 13 Oct 2010 12:54:01 +0000 (12:54 +0000)
committerinv <inv@opencascade.com>
Wed, 13 Oct 2010 12:54:01 +0000 (12:54 +0000)
src/ParaMEDMEMTest/Makefile.am
src/ParaMEDMEMTest/ParaMEDMEMTest.hxx
src/ParaMEDMEMTest/ParaMEDMEMTest_NonCoincidentDEC.cxx

index 39d8c27fcb332f54a951b421669b7e7f04fedd80..f5478b9b9829023f52b699ce7eff2f75cc981a6e 100644 (file)
@@ -25,9 +25,8 @@ salomeinclude_HEADERS = \
        MPIMainTest.hxx \
        MPIAccessDECTest.hxx \
        MPIAccessTest.hxx \
-       ParaMEDMEMTest.hxx
-
-EXTRA_DIST += MPIMainTest.hxx ParaMEDMEMTest_NonCoincidentDEC.cxx
+       ParaMEDMEMTest.hxx \
+       MPI2Connector.hxx       
 
 dist_libParaMEDMEMTest_la_SOURCES = \
        ParaMEDMEMTest.cxx \
@@ -39,6 +38,7 @@ dist_libParaMEDMEMTest_la_SOURCES = \
        ParaMEDMEMTest_ICocoTrio.cxx \
        ParaMEDMEMTest_Gauthier1.cxx \
        ParaMEDMEMTest_FabienAPI.cxx \
+       ParaMEDMEMTest_NonCoincidentDEC.cxx \
        MPIAccessDECTest.cxx \
        test_AllToAllDEC.cxx \
        test_AllToAllvDEC.cxx \
@@ -111,7 +111,6 @@ LDADD = $(MED2_LIBS) $(libMEDMEMTest_la_LDFLAGS) -lm $(MPI_LIBS) \
 
 if MED_ENABLE_FVM
        LDADD += $(FVM_LIBS)
-       dist_libParaMEDMEMTest_la_SOURCES += ParaMEDMEMTest_NonCoincidentDEC.cxx
        libParaMEDMEMTest_la_CPPFLAGS += -DMED_ENABLE_FVM $(FVM_INCLUDES)
        libParaMEDMEMTest_la_LDFLAGS += $(FVM_LIBS)
 endif
index 885da5f55a5ad5be515641773d3e01060b559c44..be30599ae5c9481a3a7d114a6831f20fa290ff7f 100644 (file)
@@ -138,11 +138,13 @@ public:
   std::string makeTmpFile( const std::string&, const std::string& = "" );
 
 private:
+#ifdef MED_ENABLE_FVM
   void testNonCoincidentDEC(const std::string& filename1, 
                             const std::string& meshname1, 
                             const std::string& filename2, 
                             const std::string& meshname2,
                             int nbprocsource, double epsilon);
+#endif
   void testAsynchronousInterpKernelDEC_2D(double dtA, double tmaxA, 
                                           double dtB, double tmaxB,
                                           bool WithPointToPoint, bool Asynchronous, bool WithInterp, const char *srcMeth, const char *targetMeth);
index ee55782a8d2bdcdb534369b18cecc7db308d32d1..8911fba39324697ae7b19f513aac8b8f9d35dd51 100644 (file)
@@ -17,6 +17,8 @@
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
+#ifdef MED_ENABLE_FVM
+
 #include "ParaMEDMEMTest.hxx"
 #include <cppunit/TestAssert.h>
 
@@ -251,3 +253,4 @@ void ParaMEDMEMTest::testNonCoincidentDEC(const string& filename1,
   MPI_Barrier(MPI_COMM_WORLD);
   
 }
+#endif