From db261b26122d87015fe8053a9402ab2842bfc260 Mon Sep 17 00:00:00 2001 From: eap Date: Wed, 26 Jun 2013 13:39:27 +0000 Subject: [PATCH] CoTech decision: move MEDWrapper from MED to SMESH Remove dependency on MED --- build_configure | 4 ---- configure.ac | 14 +++----------- src/GUI/Makefile.am | 3 +-- src/HexoticPlugin/Makefile.am | 3 +-- 4 files changed, 5 insertions(+), 19 deletions(-) diff --git a/build_configure b/build_configure index ed33294..c58385d 100755 --- 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 0f838a4..b943258 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 845ae6f..d592c33 100644 --- 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 38cadab..32a1ea0 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. -- 2.39.2