From 0035ee4cd2e7c7878ff18ede13efc964b6a3354c Mon Sep 17 00:00:00 2001 From: Gilles DAVID Date: Mon, 7 Dec 2015 15:37:49 +0100 Subject: [PATCH] Remove dependency to MED --- Makefile.am | 2 -- build_configure | 10 ---------- configure.ac | 8 -------- doc/salome/gui/GMSHPLUGIN/Makefile.am | 6 +++--- src/GMSHPlugin/Makefile.am | 2 -- src/GUI/Makefile.am | 1 - 6 files changed, 3 insertions(+), 26 deletions(-) diff --git a/Makefile.am b/Makefile.am index 779a092..fdad4a8 100755 --- a/Makefile.am +++ b/Makefile.am @@ -22,13 +22,11 @@ if GMSHPLUGIN_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 else !GMSHPLUGIN_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 endif diff --git a/build_configure b/build_configure index 3dfa46d..6b7bd9f 100755 --- a/build_configure +++ b/build_configure @@ -34,14 +34,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 @@ -76,13 +68,11 @@ 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 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 c97be48..90119b2 100755 --- a/configure.ac +++ b/configure.ac @@ -327,14 +327,6 @@ echo CHECK_GEOM - echo - echo --------------------------------------------- - echo Testing Med - echo --------------------------------------------- - echo - -CHECK_MED - echo echo --------------------------------------------- echo Testing SMesh diff --git a/doc/salome/gui/GMSHPLUGIN/Makefile.am b/doc/salome/gui/GMSHPLUGIN/Makefile.am index 42eef1c..4574b34 100755 --- a/doc/salome/gui/GMSHPLUGIN/Makefile.am +++ b/doc/salome/gui/GMSHPLUGIN/Makefile.am @@ -23,8 +23,8 @@ EXTRA_DIST += images input static/footer.html static/salome_extra.css guidocdir = $(docdir)/gui/GMSHPLUGIN guidoc_DATA = images/head.png -DOC_PYTHONPATH=$(prefix)/bin/salome:$(prefix)/lib/python$(PYTHON_VERSION)/site-packages/salome:$(SMESH_ROOT_DIR)/bin/salome:$(SMESH_ROOT_DIR)/lib/python$(PYTHON_VERSION)/site-packages/salome:$(MED_ROOT_DIR)/lib/python$(PYTHON_VERSION)/site-packages/salome:$(GEOM_ROOT_DIR)/bin/salome:$(GEOM_ROOT_DIR)/lib/python$(PYTHON_VERSION)/site-packages/salome:$(KERNEL_ROOT_DIR)/bin/salome:$(KERNEL_ROOT_DIR)/lib/python$(PYTHON_VERSION)/site-packages/salome:$(OMNIORB_ROOT)/lib/python$(PYTHON_VERSION)/site-packages:$(OMNIORB_ROOT)/lib64/python$(PYTHON_VERSION)/site-packages -DOC_LD_LIBRARY_PATH=$(prefix)/lib/salome:$(SMESH_ROOT_DIR)/lib/salome:$(MED_ROOT_DIR)/lib/salome:$(GEOM_ROOT_DIR)/lib/salome:$(KERNEL_ROOT_DIR)/lib/salome +DOC_PYTHONPATH=$(prefix)/bin/salome:$(prefix)/lib/python$(PYTHON_VERSION)/site-packages/salome:$(SMESH_ROOT_DIR)/bin/salome:$(SMESH_ROOT_DIR)/lib/python$(PYTHON_VERSION)/site-packages/salome:$(GEOM_ROOT_DIR)/bin/salome:$(GEOM_ROOT_DIR)/lib/python$(PYTHON_VERSION)/site-packages/salome:$(KERNEL_ROOT_DIR)/bin/salome:$(KERNEL_ROOT_DIR)/lib/python$(PYTHON_VERSION)/site-packages/salome:$(OMNIORB_ROOT)/lib/python$(PYTHON_VERSION)/site-packages:$(OMNIORB_ROOT)/lib64/python$(PYTHON_VERSION)/site-packages +DOC_LD_LIBRARY_PATH=$(prefix)/lib/salome:$(SMESH_ROOT_DIR)/lib/salome:$(GEOM_ROOT_DIR)/lib/salome:$(KERNEL_ROOT_DIR)/lib/salome DOC_SMESH_MeshersList=GMSHPlugin tmp/smeshBuilder.py: $(top_srcdir)/src/GMSHPlugin/GMSHPluginBuilder.py @@ -64,4 +64,4 @@ install-data-local: usr_docs cp -rp $(srcdir)/images/head.png $(DESTDIR)$(docdir)/gui/GMSHPLUGIN/gmshpluginpy_doc ; uninstall-local: - rm -rf $(DESTDIR)$(docdir)/gui/GMSHPLUGIN \ No newline at end of file + rm -rf $(DESTDIR)$(docdir)/gui/GMSHPLUGIN diff --git a/src/GMSHPlugin/Makefile.am b/src/GMSHPlugin/Makefile.am index 86c276b..cec953d 100755 --- a/src/GMSHPlugin/Makefile.am +++ b/src/GMSHPlugin/Makefile.am @@ -49,7 +49,6 @@ dist_libGMSHEngine_la_SOURCES = \ libGMSHEngine_la_CPPFLAGS = \ $(KERNEL_CXXFLAGS) \ $(GUI_CXXFLAGS) \ - $(MED_CXXFLAGS) \ $(GEOM_CXXFLAGS) \ $(CAS_CPPFLAGS) \ $(VTK_INCLUDES) \ @@ -68,7 +67,6 @@ libGMSHEngine_la_LDFLAGS += \ $(CAS_LDPATH) -lTKernel -lTKBRep -lTKShHealing -lTKSTEP -lTKXSBase -lTKIGES -lTKMesh -lTKSTL -lTKG3d -lTKTopAlgo -lTKG2d -lTKBool -lTKGeomAlgo -lTKOffset -lTKGeomBase -lTKBO \ -lTKMath -lTKFillet -lTKMeshVS -lTKPrim -lTKSTEPBase -lTKSTEPAttr -lTKSTEP209 -lTKXDESTEP -lTKXDEIGES -lTKXCAF -lTKLCAF -lFWOSPlugin \ $(GEOM_LDFLAGS) -lGEOMbasic \ - $(MED_LDFLAGS) -lSalomeIDLMED \ $(SMESH_LDFLAGS) -lSMESHimpl -lSMESHEngine -lSMESHUtils -lStdMeshersEngine -lStdMeshers -lSMESHDS -lSMDS -lSMESHControls \ $(KERNEL_LDFLAGS) -lSalomeGenericObj -lSalomeNS -lSALOMELocalTrace -lOpUtil diff --git a/src/GUI/Makefile.am b/src/GUI/Makefile.am index 5afa8ab..7d32a5c 100755 --- a/src/GUI/Makefile.am +++ b/src/GUI/Makefile.am @@ -46,7 +46,6 @@ libGMSHPluginGUI_la_CPPFLAGS = \ $(KERNEL_CXXFLAGS) \ $(GUI_CXXFLAGS) \ $(GEOM_CXXFLAGS) \ - $(MED_CXXFLAGS) \ $(SMESH_CXXFLAGS) \ $(BOOST_CPPFLAGS) \ $(CORBA_CXXFLAGS) \ -- 2.39.2