CoTech decision: move MEDWrapper from MED to SMESH

Remove dependency on MED

diff --git a/build_configure b/build_configure
index ed33294f89860b91d795626aeafa1dcad021f412..c58385d0dcb04b3f682166cc96c912cc4b0a195a 100755 (executable)
--- a/build_configure
+++ b/build_configure
@@ -76,7 +76,6 @@ if test -d "${GUI_ROOT_DIR}"; then
     aclocal -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 || exit 1
@@ -84,7 +83,6 @@ if test -d "${GUI_ROOT_DIR}"; then
     aclocal -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 || exit 1
   fi
@@ -92,14 +90,12 @@ else
   if test -d "${BLSURFPLUGIN_ROOT_DIR}"; then
     aclocal -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 || exit 1
   else
     aclocal -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 || exit 1
   fi

diff --git a/configure.ac b/configure.ac
index 0f838a4faf61db1f607acb408088089828650c5b..b943258c3202de16503d43f50d8720d854e5c4a1 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 845ae6f9e7c914b5b05b6e9023b9be49887e711a..d592c333b504dfa7bf272ae68595e650377b9e24 100644 (file)
--- a/src/GUI/Makefile.am
+++ b/src/GUI/Makefile.am
@@ -46,7 +46,7 @@ UIC_FILES =     \
         ui_HexoticPluginGUI_StdWidget_QTD.h
 
 BUILT_SOURCES = $(UIC_FILES)
-        
+
 nodist_libHexoticPluginGUI_la_SOURCES = \
        $(MOC_FILES)
 
@@ -59,7 +59,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 38cadab7d8bb4585a02a8f2af1a4ce6277000ffa..32a1ea0889f6cc9f9c63b1ccbb72fb3a4cefaef9 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.