From 9646275dbc468b3308d79a1a74ab98c45a5a5741 Mon Sep 17 00:00:00 2001 From: gdd Date: Thu, 11 Jul 2013 08:19:30 +0000 Subject: [PATCH] Remove dependency to MED --- Makefile.am | 2 -- build_configure | 10 ---------- configure.ac | 14 +++----------- src/GUI/Makefile.am | 2 -- src/HEXABLOCKPlugin/Makefile.am | 2 -- 5 files changed, 3 insertions(+), 27 deletions(-) diff --git a/Makefile.am b/Makefile.am index 7019dc7..3b3719c 100755 --- a/Makefile.am +++ b/Makefile.am @@ -29,14 +29,12 @@ if HEXABLOCKPLUGIN_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 ${HEXABLOCK_ROOT_DIR}/adm_local/unix/config_files \ -I ${SMESH_ROOT_DIR}/adm_local/unix/config_files else !HEXABLOCKPLUGIN_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 ${HEXABLOCK_ROOT_DIR}/adm_local/unix/config_files \ -I ${SMESH_ROOT_DIR}/adm_local/unix/config_files diff --git a/build_configure b/build_configure index 63a41b2..0e8a7c8 100755 --- a/build_configure +++ b/build_configure @@ -51,14 +51,6 @@ if test ! -d "${HEXABLOCK_ROOT_DIR}"; then 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 SMESH_ROOT_DIR is set correctly @@ -85,14 +77,12 @@ 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 ${HEXABLOCK_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 ${HEXABLOCK_ROOT_DIR}/adm_local/unix/config_files \ -I ${SMESH_ROOT_DIR}/adm_local/unix/config_files || exit 1 diff --git a/configure.ac b/configure.ac index f03ccae..93d3dfa 100755 --- a/configure.ac +++ b/configure.ac @@ -331,14 +331,6 @@ echo CHECK_GEOM -echo -echo --------------------------------------------- -echo Testing Med -echo --------------------------------------------- -echo - -CHECK_MED - echo echo --------------------------------------------- echo Testing SMesh @@ -363,11 +355,11 @@ echo echo Configure if test "${gui_ok}" = "yes"; then - variables="cc_ok boost_ok threads_ok omniORB_ok occ_ok doxygen_ok OpenGL_ok qt_ok vtk_ok Kernel_ok gui_ok Geom_ok Med_ok SMesh_ok HEXABLOCK_ok" + variables="cc_ok boost_ok threads_ok omniORB_ok occ_ok doxygen_ok OpenGL_ok qt_ok vtk_ok Kernel_ok gui_ok Geom_ok SMesh_ok HEXABLOCK_ok" elif test "${SalomeGUI_need}" != "no"; then - variables="cc_ok boost_ok threads_ok omniORB_ok occ_ok doxygen_ok Kernel_ok gui_ok Geom_ok Med_ok SMesh_ok HEXABLOCK_ok" + variables="cc_ok boost_ok threads_ok omniORB_ok occ_ok doxygen_ok Kernel_ok gui_ok Geom_ok SMesh_ok HEXABLOCK_ok" else - variables="cc_ok boost_ok threads_ok omniORB_ok occ_ok doxygen_ok Kernel_ok Geom_ok Med_ok SMesh_ok HEXABLOCK_ok" + variables="cc_ok boost_ok threads_ok omniORB_ok occ_ok doxygen_ok Kernel_ok Geom_ok SMesh_ok HEXABLOCK_ok" fi for var in $variables diff --git a/src/GUI/Makefile.am b/src/GUI/Makefile.am index dfd1c18..fd12b60 100755 --- a/src/GUI/Makefile.am +++ b/src/GUI/Makefile.am @@ -42,7 +42,6 @@ libHEXABLOCKPluginGUI_la_CPPFLAGS = \ $(GUI_CXXFLAGS) \ $(GEOM_CXXFLAGS) \ $(HEXABLOCK_CXXFLAGS) \ - $(MED_CXXFLAGS) \ $(SMESH_CXXFLAGS) \ $(BOOST_CPPFLAGS) \ $(CORBA_CXXFLAGS) \ @@ -55,7 +54,6 @@ libHEXABLOCKPluginGUI_la_LDFLAGS = \ ../../idl/libSalomeIDLHEXABLOCKPLUGIN.la \ $(QT_LIBS) \ $(KERNEL_LDFLAGS) -lSALOMELocalTrace \ - $(MED_LDFLAGS) -lSalomeIDLMED \ $(SMESH_LDFLAGS) -lSMESH \ $(GUI_LDFLAGS) -lsuit -lqtx -lSalomeApp \ $(CAS_KERNEL) diff --git a/src/HEXABLOCKPlugin/Makefile.am b/src/HEXABLOCKPlugin/Makefile.am index ea8cee4..b5ccdea 100755 --- a/src/HEXABLOCKPlugin/Makefile.am +++ b/src/HEXABLOCKPlugin/Makefile.am @@ -53,7 +53,6 @@ libHexaBlockEngine_la_CPPFLAGS = \ $(VTK_INCLUDES) \ $(GEOM_CXXFLAGS) \ $(HEXABLOCK_CXXFLAGS) \ - $(MED_CXXFLAGS) \ $(SMESH_CXXFLAGS) \ $(BOOST_CPPFLAGS) \ $(CORBA_CXXFLAGS) \ @@ -64,6 +63,5 @@ libHexaBlockEngine_la_LDFLAGS = \ ../../idl/libSalomeIDLHEXABLOCKPLUGIN.la \ $(CAS_KERNEL) -lTKBRep -lTKG2d -lTKG3d -lTKTopAlgo -lTKGeomBase -lTKGeomAlgo \ $(HEXABLOCK_LDFLAGS) -lHEXABLOCKEngine \ - $(MED_LDFLAGS) -lSalomeIDLMED \ $(SMESH_LDFLAGS) -lSMESHimpl -lSMESHEngine -lSMESHDS -lSMDS \ $(KERNEL_LDFLAGS) -lSalomeGenericObj -lSALOMELocalTrace -lSALOMEBasics -- 2.39.2