-# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
#
-# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License.
#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License.
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
+
# MED MEDMEM : MED files in memory
#
include $(top_srcdir)/adm_local/unix/make_common_starter.am
#libmedmem_la_LDFLAGS= -L$(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome
-#libMEDMEMBinTest_la_CPPFLAGS= $(MED2_INCLUDES) $(HDF5_INCLUDES) @CXXTMPDPTHFLAGS@ \
+#libMEDMEMBinTest_la_CPPFLAGS= $(MED3_INCLUDES) $(HDF5_INCLUDES) @CXXTMPDPTHFLAGS@ \
# -I$(srcdir)/../MEDWrapper/Base \
# -I$(srcdir)/../MEDWrapper/V2_1/Core -I$(srcdir)/../INTERPOLATION
# change motivated by the bug KERNEL4778.
-#libMEDMEMBinTest_la_LDFLAGS=$(MED2_LIBS) $(HDF5_LIBS) ../MEDWrapper/V2_1/Core/libmed_V2_1.la \
+#libMEDMEMBinTest_la_LDFLAGS=$(MED3_LIBS_C_ONLY) $(HDF5_LIBS) ../MEDWrapper/V2_1/Core/libmed_V2_1.la \
# ../MEDWrapper/Base/libMEDWrapperBase.la $(STDLIB)
#if MED_ENABLE_KERNEL
# libMEDMEMBinTest_la_CPPFLAGS+= ${KERNEL_CXXFLAGS}
# libMEDMEMBinTest_la_LDFLAGS+= ${KERNEL_LDFLAGS} -lSALOMELocalTrace
#endif
-AM_CPPFLAGS= $(MED2_INCLUDES) $(HDF5_INCLUDES) @CXXTMPDPTHFLAGS@ \
- -I$(srcdir)/../MEDWrapper/Base \
- -I$(srcdir)/../MEDWrapper/V2_1/Core -I$(srcdir)/../INTERPOLATION \
+AM_CPPFLAGS += $(MED3_INCLUDES) $(HDF5_INCLUDES) @CXXTMPDPTHFLAGS@ \
+ -I$(srcdir)/../INTERP_KERNEL \
+ -I$(srcdir)/../INTERP_KERNEL/Bases \
+ -I$(srcdir)/../INTERP_KERNEL/GaussPoints \
-I$(srcdir)/../MEDMEM
-LDADD= $(MED2_LIBS) $(HDF5_LIBS) ../MEDWrapper/V2_1/Core/libmed_V2_1.la \
- ../MEDWrapper/Base/libMEDWrapperBase.la $(STDLIB) ../MEDMEM/libmedmem.la
+LDADD= $(MED3_LIBS_C_ONLY) $(HDF5_LIBS) \
+ $(STDLIB) ../MEDMEM/libmedmem.la ../INTERP_KERNEL/libinterpkernel.la
+
if MED_ENABLE_KERNEL
AM_CPPFLAGS+= ${KERNEL_CXXFLAGS}
bin_PROGRAMS= \
- ensight2med med2ensight convertToPoly \
- med2_1_To_med2_2 med2vtk duplicateMED medmembin_test duplicateMEDMESH test_write_groups_poly\
+ ensight2med med2ensight convertToPoly dumpInterpolation \
+ med2vtk duplicateMED medmembin_test duplicateMEDMESH test_write_groups_poly\
test_MEDMEM_ModulusArray test_MEDMEM_Array test_MEDMEM_SkyLineArray \
test_MEDMEM_CellModel testUPointerOf testUCoordinate testUUnit \
testUGeoNameMeshEntities testUMedException testUModulusArray \
test_copie_family test_copie_group test_copie_mesh test_affect_medarray \
test_MEDMEM_Meshing test_MEDMEM_MeshingPoly test_operation_fielddouble \
test_operation_fieldint test_gibi_driver test_porflow_driver \
- test_grid test_MEDMEM_PolyhedronArray test_MEDMEM_PolyConnectivity \
+ test_grid \
test_MEDMEM_PolyDriverMedMeshRead test_MEDMEM_PolyDriverMedMeshWrite \
test_MEDMEM_poly3D test_MEDMEM_nArray test_MEDMEM_Meshing_poly test_profil_MedFieldDriver \
test_profil_gauss_MedFieldDriver test_GaussLocalization testAnalFile test_MEDMEM_MeshingFlica testConvertPolygon \
# tests that fail because they require arguments
XFAIL_TESTS = \
+ dumpInterpolation \
convertToPoly \
duplicateMED \
duplicateMEDMESH \
ensight2med \
- med2_1_To_med2_2 \
med2ensight \
med2vtk \
medmembin_test \
scripts/check_convertToPoly \
scripts/check_duplicateMED \
scripts/check_ensight2med \
- scripts/check_med2_1_To_med2_2 \
scripts/check_med2ensight \
scripts/check_med2vtk \
scripts/check_readCoordinate \
# LDADD+=-lSALOMEBasics
#endif
+dist_dumpInterpolation_SOURCES= dumpInterpolation.cxx
dist_convertToPoly_SOURCES= convertToPoly.cxx
dist_ensight2med_SOURCES= ensight2med.cxx
dist_med2ensight_SOURCES= med2ensight.cxx
-dist_med2_1_To_med2_2_SOURCES= med2_1_To_med2_2.cxx
dist_med2vtk_SOURCES= med2vtk.cxx
dist_duplicateMED_SOURCES= duplicateMED.cxx
dist_medmembin_test_SOURCES= med_test.cxx
dist_test_gibi_driver_SOURCES= test_gibi_driver.cxx
dist_test_porflow_driver_SOURCES= test_porflow_driver.cxx
dist_test_grid_SOURCES= test_grid.cxx
-dist_test_MEDMEM_PolyhedronArray_SOURCES= test_MEDMEM_PolyhedronArray.cxx
-dist_test_MEDMEM_PolyConnectivity_SOURCES= test_MEDMEM_PolyConnectivity.cxx
dist_test_MEDMEM_PolyDriverMedMeshRead_SOURCES= test_MEDMEM_PolyDriverMedMeshRead.cxx
dist_test_MEDMEM_PolyDriverMedMeshWrite_SOURCES= test_MEDMEM_PolyDriverMedMeshWrite.cxx
dist_test_MEDMEM_poly3D_SOURCES= test_MEDMEM_poly3D.cxx
