From e92d4f939df30cca72faa2e72bc269dc4a9244dc Mon Sep 17 00:00:00 2001 From: gdd Date: Mon, 15 Jul 2013 12:08:08 +0000 Subject: [PATCH] Remove dependency on MED module --- Makefile.am | 1 - build_configure | 10 ---------- configure.ac | 12 ++---------- idl/Makefile.am | 9 ++------- src/HOMARDGUI/Makefile.am | 2 -- src/HOMARD_I/Makefile.am | 11 +++++------ 6 files changed, 9 insertions(+), 36 deletions(-) diff --git a/Makefile.am b/Makefile.am index 8208a203..974d38b2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -27,7 +27,6 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am 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 ${SMESH_ROOT_DIR}/adm_local/unix/config_files SUBDIRS = idl adm_local resources src bin doc tests diff --git a/build_configure b/build_configure index b6a271bc..a8e2f91d 100755 --- a/build_configure +++ b/build_configure @@ -45,15 +45,6 @@ if test ! -d "${GUI_ROOT_DIR}"; then 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 : $MED_ROOT_DIR" - exit -fi - - ######################################################################## # Test if the SMESH_ROOT_DIR is set correctly @@ -80,7 +71,6 @@ echo "====================================================== aclocal" 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 ${SMESH_ROOT_DIR}/adm_local/unix/config_files || exit 1 # ____________________________________________________________________ diff --git a/configure.ac b/configure.ac index d13a49d8..48dd075b 100644 --- a/configure.ac +++ b/configure.ac @@ -309,14 +309,6 @@ echo CHECK_MED3 -echo -echo --------------------------------------------- -echo Testing Med Module -echo --------------------------------------------- -echo - -CHECK_MED - echo echo --------------------------------------------- echo Testing Smesh @@ -343,11 +335,11 @@ echo echo Configure if test "${HOMARD_WITH_GUI}" = "yes"; then -variables="cc_ok fortran_ok boost_ok python_ok swig_ok threads_ok OpenGL_ok qt_ok hdf5_ok omniORB_ok Kernel_ok med3_ok SalomeGUI_ok Med_ok SMesh_ok sphinx_ok" +variables="cc_ok fortran_ok boost_ok python_ok swig_ok threads_ok OpenGL_ok qt_ok hdf5_ok omniORB_ok Kernel_ok med3_ok SalomeGUI_ok SMesh_ok sphinx_ok" fi if test "${HOMARD_WITH_GUI}" = "no"; then -variables="cc_ok fortran_ok boost_ok lex_yacc_ok python_ok swig_ok threads_ok hdf5_ok omniORB_ok doxygen_ok graphviz_ok Kernel_ok Geom_ok Med_ok SMesh_ok sphinx_ok" +variables="cc_ok fortran_ok boost_ok lex_yacc_ok python_ok swig_ok threads_ok hdf5_ok omniORB_ok doxygen_ok graphviz_ok Kernel_ok Geom_ok SMesh_ok sphinx_ok" fi for var in $variables diff --git a/idl/Makefile.am b/idl/Makefile.am index c4edc404..85c912ef 100644 --- a/idl/Makefile.am +++ b/idl/Makefile.am @@ -52,7 +52,6 @@ libSalomeIDLHOMARD_la_CPPFLAGS = \ $(KERNEL_CXXFLAGS) \ -I$(top_builddir)/adm_local/unix \ -I$(top_builddir)/idl \ - $(MED_CXXFLAGS) \ @CORBA_CXXFLAGS@ \ @CORBA_INCLUDES@ @@ -60,8 +59,6 @@ libSalomeIDLHOMARD_la_LDFLAGS = -no-undefined -version-info=0:0:0 libSalomeIDLHOMARD_la_LIBADD = \ $(KERNEL_LDFLAGS) -lSalomeIDLKernel \ @CORBA_LIBS@ -# $(VISU_LDFLAGS) -lSalomeIDLVisu -# $(MED_LDFLAGS) -lSalomeIDLMed # These variables defines the building process of CORBA files OMNIORB_IDL = @OMNIORB_IDL@ @@ -76,12 +73,10 @@ IDLCXXFLAGS = \ @IDLCXXFLAGS@ \ -I$(top_builddir)/idl/salome \ -I$(KERNEL_ROOT_DIR)/idl/salome \ - -I$(MED_ROOT_DIR)/idl/salome \ -I$(top_builddir)/adm_local/unix IDLPYFLAGS = \ @IDLPYFLAGS@ \ - -I$(KERNEL_ROOT_DIR)/idl/salome \ - -I$(MED_ROOT_DIR)/idl/salome + -I$(KERNEL_ROOT_DIR)/idl/salome # potential problem on parallel make on the following - multiple outputs SUFFIXES = .idl .hh SK.cc @@ -118,7 +113,7 @@ mostlyclean-local: @for dep in $^ dummy; do \ if [ $$dep != "dummy" ]; then \ echo Building dependencies for $$dep; \ - $(CPP) $(C_DEPEND_FLAG) -x c -I$(srcdir) -I$(KERNEL_ROOT_DIR)/idl/salome -I$(MED_ROOT_DIR)/idl/salome $$dep 2>/dev/null | \ + $(CPP) $(C_DEPEND_FLAG) -x c -I$(srcdir) -I$(KERNEL_ROOT_DIR)/idl/salome $$dep 2>/dev/null | \ sed 's/\.o/\SK.cc/' >>$@; \ fi; \ done ; diff --git a/src/HOMARDGUI/Makefile.am b/src/HOMARDGUI/Makefile.am index 46dffbb7..7af8208c 100644 --- a/src/HOMARDGUI/Makefile.am +++ b/src/HOMARDGUI/Makefile.am @@ -123,8 +123,6 @@ libHOMARD_la_CPPFLAGS = \ -I$(srcdir)/../HOMARD_I \ -I$(top_builddir)/idl \ -I$(top_builddir) \ - -I$(VISU_ROOT_DIR)/include/salome \ - -I$(MED_ROOT_DIR)/include/salome \ -I$(top_builddir)/adm_local/unix libHOMARD_la_LDFLAGS = \ diff --git a/src/HOMARD_I/Makefile.am b/src/HOMARD_I/Makefile.am index aee3bc34..48612cd0 100644 --- a/src/HOMARD_I/Makefile.am +++ b/src/HOMARD_I/Makefile.am @@ -32,7 +32,7 @@ salomeinclude_HEADERS = \ HOMARD_Zone_i.hxx \ HOMARD_Gen_i.hxx \ HOMARD_Boundary_i.hxx \ - HomardMedCommun.h + HomardMedCommun.h # Libraries targets @@ -45,7 +45,7 @@ dist_libHOMARDEngine_la_SOURCES = \ HOMARD_Gen_i.cxx \ HOMARD_Zone_i.cxx \ HOMARD_Boundary_i.cxx \ - HomardMedCommun.cxx + HomardMedCommun.cxx @@ -61,9 +61,8 @@ libHOMARDEngine_la_CPPFLAGS = \ -I$(srcdir)/../HOMARDGUI \ -I$(top_builddir) \ -I$(top_builddir)/idl \ - -I$(GEOM_ROOT_DIR)/include/salome \ - -I$(SMESH_ROOT_DIR)/include/salome \ - -I$(MED_ROOT_DIR)/include/salome \ + -I$(GEOM_ROOT_DIR)/include/salome \ + -I$(SMESH_ROOT_DIR)/include/salome \ -I$(top_builddir)/adm_local/unix @@ -79,5 +78,5 @@ libHOMARDEngine_la_LDFLAGS = \ -lSalomeLifeCycleCORBA \ -lTOOLSDS \ -lSalomeGenericObj \ - $(SMESH_LDFLAGS) \ + $(SMESH_LDFLAGS) \ -lSalomeIDLSMESH -- 2.39.2