From: inv <inv@opencascade.com>
Date: Wed, 13 Oct 2010 12:54:01 +0000 (+0000)
Subject: Fix make distcheck problems
X-Git-Tag: V5_1_5~17
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=79832e10d3d9293c95d8ddf50aae71432b1f8706;p=tools%2Fmedcoupling.git

Fix make distcheck problems
---

diff --git a/src/ParaMEDMEMTest/Makefile.am b/src/ParaMEDMEMTest/Makefile.am
index 39d8c27fc..f5478b9b9 100644
--- a/src/ParaMEDMEMTest/Makefile.am
+++ b/src/ParaMEDMEMTest/Makefile.am
@@ -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
diff --git a/src/ParaMEDMEMTest/ParaMEDMEMTest.hxx b/src/ParaMEDMEMTest/ParaMEDMEMTest.hxx
index 885da5f55..be30599ae 100644
--- a/src/ParaMEDMEMTest/ParaMEDMEMTest.hxx
+++ b/src/ParaMEDMEMTest/ParaMEDMEMTest.hxx
@@ -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);
diff --git a/src/ParaMEDMEMTest/ParaMEDMEMTest_NonCoincidentDEC.cxx b/src/ParaMEDMEMTest/ParaMEDMEMTest_NonCoincidentDEC.cxx
index ee55782a8..8911fba39 100644
--- a/src/ParaMEDMEMTest/ParaMEDMEMTest_NonCoincidentDEC.cxx
+++ b/src/ParaMEDMEMTest/ParaMEDMEMTest_NonCoincidentDEC.cxx
@@ -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