From: eap <eap@opencascade.com>
Date: Wed, 26 Jun 2013 13:35:46 +0000 (+0000)
Subject: CoTech decision: move MEDWrapper from MED to SMESH
X-Git-Tag: V7_4_0a1~3
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=730b9ec603f7eef11e4776cc7df94a79781b75fd;p=plugins%2Fhexoticplugin.git

CoTech decision: move MEDWrapper from MED to SMESH

Remove dependency on MED
---

diff --git a/Makefile.am b/Makefile.am
index f13ae52..669c1b5 100644
--- 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 5f2a133..c41170f 100755
--- 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 96a5f16..78081d3 100644
--- 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 2aba130..2f1ff5d 100644
--- 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 1d80ffa..b61855b 100644
--- 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.