CoTech decision: move MEDWrapper from MED to SMESH

Remove dependency on MED

diff --git a/Makefile.am b/Makefile.am
index f13ae523f5e40d0d89fbb69358bafe3dc33b1aef..669c1b5482e8b23228dcd7e957cda719a63556ae 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,14 +28,12 @@ if HEXOTICPLUGIN_ENABLE_GUI
   ACLOCAL_AMFLAGS = -I adm_local/unix/config_files \
                     -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \
                     -I ${GUI_ROOT_DIR}/adm_local/unix/config_files \
-                    -I ${MED_ROOT_DIR}/adm_local/unix/config_files \
                     -I ${GEOM_ROOT_DIR}/adm_local/unix/config_files \
                     -I ${SMESH_ROOT_DIR}/adm_local/unix/config_files
 #                    -I ${BLSURFPLUGIN_ROOT_DIR}/adm_local/unix/config_files
 else !HEXOTICPLUGIN_ENABLE_GUI
   ACLOCAL_AMFLAGS = -I adm_local/unix/config_files \
                     -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \
-                    -I ${MED_ROOT_DIR}/adm_local/unix/config_files \
                     -I ${GEOM_ROOT_DIR}/adm_local/unix/config_files \
                     -I ${SMESH_ROOT_DIR}/adm_local/unix/config_files
 #                    -I ${BLSURFPLUGIN_ROOT_DIR}/adm_local/unix/config_files

diff --git a/build_configure b/build_configure
index 5f2a133ece6668b0e82bc4ac3a7dd5ac706395d9..c41170fdf831467ac9d4beeca397961049f0f765 100755 (executable)
--- a/build_configure
+++ b/build_configure
@@ -41,14 +41,6 @@ fi
 #    exit
 #fi
 
-########################################################################
-# Test if the MED_ROOT_DIR is set correctly
-
-if test ! -d "${MED_ROOT_DIR}"; then
-    echo "failed : MED_ROOT_DIR variable is not correct !"
-    exit
-fi
-
 ########################################################################
 # Test if the GEOM_ROOT_DIR is set correctly
 

diff --git a/configure.ac b/configure.ac
index 96a5f16b81b8c4e6166e3970308a02408af5f701..78081d377c1453877f8a86d6b0ba0a60a41ff216 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -340,14 +340,6 @@ echo
 
 CHECK_GEOM
 
-echo
-echo ---------------------------------------------
-echo Testing Med
-echo ---------------------------------------------
-echo
- 
-CHECK_MED
-
 echo
 echo ---------------------------------------------
 echo Testing SMesh
@@ -377,13 +369,13 @@ echo
 #AM_CONDITIONAL( USE_GFORTRAN, [test "$F77" = "gfortran"])
 
 if test "${gui_ok}" = "yes"; then
-  variables="cc_ok boost_ok lex_yacc_ok python_ok swig_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok omniORB_ok occ_ok doxygen_ok graphviz_ok Kernel_ok Geom_ok Med_ok SMesh_ok gui_ok"
+  variables="cc_ok boost_ok lex_yacc_ok python_ok swig_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok omniORB_ok occ_ok doxygen_ok graphviz_ok Kernel_ok Geom_ok SMesh_ok gui_ok"
   opt_variables="Hexotic_ok BLSURFplugin_ok"
 elif test "${SalomeGUI_need}" != "no"; then
-  variables="cc_ok boost_ok lex_yacc_ok python_ok swig_ok threads_ok vtk_ok hdf5_ok omniORB_ok occ_ok doxygen_ok graphviz_ok Kernel_ok Geom_ok Med_ok SMesh_ok gui_ok"
+  variables="cc_ok boost_ok lex_yacc_ok python_ok swig_ok threads_ok vtk_ok hdf5_ok omniORB_ok occ_ok doxygen_ok graphviz_ok Kernel_ok Geom_ok SMesh_ok gui_ok"
   opt_variables="Hexotic_ok BLSURFplugin_ok"
 else
-  variables="cc_ok boost_ok lex_yacc_ok python_ok swig_ok threads_ok vtk_ok hdf5_ok omniORB_ok occ_ok doxygen_ok graphviz_ok Kernel_ok Geom_ok Med_ok SMesh_ok"
+  variables="cc_ok boost_ok lex_yacc_ok python_ok swig_ok threads_ok vtk_ok hdf5_ok omniORB_ok occ_ok doxygen_ok graphviz_ok Kernel_ok Geom_ok SMesh_ok"
   opt_variables="Hexotic_ok BLSURFplugin_ok"
 fi
 

diff --git a/src/GUI/Makefile.am b/src/GUI/Makefile.am
index 2aba1301643529c930869787f63f60621856a4a6..2f1ff5d0b833d903460bd8e8954a298bb32bb3af 100644 (file)
--- a/src/GUI/Makefile.am
+++ b/src/GUI/Makefile.am
@@ -51,7 +51,6 @@ libHexoticPluginGUI_la_CPPFLAGS =     \
        $(KERNEL_CXXFLAGS)              \
        $(GUI_CXXFLAGS)                 \
        $(GEOM_CXXFLAGS)                \
-       $(MED_CXXFLAGS)                 \
        $(SMESH_CXXFLAGS)               \
        $(BOOST_CPPFLAGS)               \
        $(CORBA_CXXFLAGS)               \

diff --git a/src/HexoticPlugin/Makefile.am b/src/HexoticPlugin/Makefile.am
index 1d80ffa275b026d53cf89d33fa5b2df8c18e545b..b61855b9fe8c76def99d4138166f3348b7732d09 100644 (file)
--- a/src/HexoticPlugin/Makefile.am
+++ b/src/HexoticPlugin/Makefile.am
@@ -52,7 +52,6 @@ libHexoticEngine_la_CPPFLAGS =                        \
        $(VTK_INCLUDES)                         \
        $(KERNEL_CXXFLAGS)                      \
        $(GUI_CXXFLAGS)                         \
-       $(MED_CXXFLAGS)                         \
        $(GEOM_CXXFLAGS)                        \
        $(BLSURFPLUGIN_CXXFLAGS)
 
@@ -60,7 +59,7 @@ libHexoticEngine_la_LDFLAGS  =                        \
        ../../idl/libSalomeIDLHexoticPLUGIN.la  \
        $(SMESH_LDFLAGS) -lSMESHimpl -lSMESHEngine -lStdMeshersEngine -lSMDS -lSMESHDS -lSalomeIDLSMESH -lSMESHUtils \
        $(KERNEL_LDFLAGS) -lSalomeGenericObj -lSALOMELocalTrace \
-       $(CAS_LDPATH) -lTKernel -lTKMath -lTKG3d -lTKTopAlgo -lTKBRep $(MED_LDFLAGS) -lSalomeIDLMED -lSALOMELocalTrace \
+       $(CAS_LDPATH) -lTKernel -lTKMath -lTKG3d -lTKTopAlgo -lTKBRep -lSALOMELocalTrace \
        $(BLSURFPLUGIN_LDFLAGS)
 
 # Scripts to be installed.