From: abd Date: Thu, 19 Oct 2006 06:54:02 +0000 (+0000) Subject: First stable version after merging with V3_2_2 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2FWPdev;p=plugins%2Fnetgenplugin.git First stable version after merging with V3_2_2 --- diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in index 19336a2..91a90d9 100644 --- a/adm_local/unix/make_commence.in +++ b/adm_local/unix/make_commence.in @@ -1,6 +1,8 @@ # common directories to put headerfiles inc_builddir=$(top_builddir)/include/salome +MODULE_NAME=@MODULE_NAME@ + @SET_MAKE@ SHELL=/bin/sh @@ -10,7 +12,7 @@ HAVE_SSTREAM=@HAVE_SSTREAM@ LIBS=@LIBS@ -LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib/salome -Xlinker -rpath-link -Xlinker $(top_builddir)/lib/salome +LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome -Xlinker -rpath-link -Xlinker $(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome # add libstdc++ to link c++ library with libtool ! LDFLAGS+= -lstdc++ @@ -173,7 +175,7 @@ SALOME_INCLUDES = \ CPPFLAGS += -DSOLIDGEOM -DLINUX $(OCC_INCLUDES) $(SALOME_INCLUDES) $(BOOST_CPPFLAGS) CXXFLAGS += -DSOLIDGEOM -DLINUX $(OCC_CXXFLAGS) $(SALOME_INCLUDES) -LDFLAGS += -lSMESHimpl -lSMESHEngine -lStdMeshers -lStdMeshersEngine -L${KERNEL_ROOT_DIR}/lib/salome -L${SMESH_ROOT_DIR}/lib/salome -L${GEOM_ROOT_DIR}/lib/salome -lSalomeGenericObj +LDFLAGS += -lSMESHimpl -lSMESHEngine -lStdMeshers -lStdMeshersEngine -L${KERNEL_ROOT_DIR}/lib@LIB_LOCATION_SUFFIX@/salome -L${SMESH_ROOT_DIR}/lib@LIB_LOCATION_SUFFIX@/salome -L${GEOM_ROOT_DIR}/lib@LIB_LOCATION_SUFFIX@/salome -lSalomeGenericObj # add corba libs when link salome application ! #LDFLAGS+= $(CORBA_LIBS) @@ -203,7 +205,7 @@ LN_S=@LN_S@ prefix=@prefix@ exec_prefix=@exec_prefix@ bindir=@bindir@/salome -libdir=@libdir@/salome +libdir=@exec_prefix@/lib@LIB_LOCATION_SUFFIX@/salome # warning : if user give this path in configure we could have salome/salome :-( includedir=@includedir@/salome datadir=@datadir@/salome diff --git a/configure.in.base b/configure.in.base index 42a557a..41fd357 100644 --- a/configure.in.base +++ b/configure.in.base @@ -22,11 +22,15 @@ AC_CANONICAL_HOST PACKAGE=salome AC_SUBST(PACKAGE) -VERSION=3.2.0 -XVERSION=0x030200 +VERSION=3.2.2 +XVERSION=0x030202 AC_SUBST(VERSION) AC_SUBST(XVERSION) +# set up MODULE_NAME variable for dynamic construction of directories (resources, etc.) +MODULE_NAME=netgenplugin +AC_SUBST(MODULE_NAME) + dnl dnl Initialize source and build root directories dnl @@ -356,7 +360,7 @@ else fi # make other build directories -for rep in salome_adm adm_local doc bin/salome include/salome lib/salome share/salome/resources idl +for rep in salome_adm adm_local doc bin/salome include/salome lib${LIB_LOCATION_SUFFIX}/salome share/salome/resources/${MODULE_NAME} idl do # if test ! -d $rep ; then # eval mkdir $rep diff --git a/idl/Makefile.in b/idl/Makefile.in index 980cd86..db81b82 100644 --- a/idl/Makefile.in +++ b/idl/Makefile.in @@ -46,7 +46,7 @@ $(IDL_FILES:%=$(top_builddir)/idl/salome/%):$(IDL_FILES:%=$(top_srcdir)/idl/%) # python wrap lib: pyidl -PYTHON_BUILD_SITE=$(top_builddir)/lib/python$(PYTHON_VERSION)/site-packages/@PACKAGE@ +PYTHON_BUILD_SITE=$(top_builddir)/lib@LIB_LOCATION_SUFFIX@/python$(PYTHON_VERSION)/site-packages/@PACKAGE@ pyidl: $(PYTHON_BUILD_SITE) $(IDL_FILES:%.idl=$(PYTHON_BUILD_SITE)/%_idl.py) diff --git a/src/GUI/Makefile.in b/src/GUI/Makefile.in index d12da02..4fea40a 100644 --- a/src/GUI/Makefile.in +++ b/src/GUI/Makefile.in @@ -67,8 +67,7 @@ CPPFLAGS += $(QT_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) \ CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome \ -I${GEOM_ROOT_DIR}/include/salome -I${SMESH_ROOT_DIR}/include/salome -LDFLAGS += -lSMESH $(OCC_KERNEL_LIBS) -L${KERNEL_ROOT_DIR}/lib/salome \ - -L${GUI_ROOT_DIR}/lib/salome -L${GEOM_ROOT_DIR}/lib/salome \ - -L${SMESH_ROOT_DIR}/lib/salome +LDFLAGS += $(OCC_KERNEL_LIBS) $(KERNEL_LDFLAGS) $(GUI_LDFLAGS) ${GEOM_LDFLAGS} ${SMESH_LDFLAGS} -lSMESH + @CONCLUDE@ diff --git a/src/NETGEN/ReadMeForNgUsers b/src/NETGEN/ReadMeForNgUsers index 4abb2b1..e14d714 100644 --- a/src/NETGEN/ReadMeForNgUsers +++ b/src/NETGEN/ReadMeForNgUsers @@ -9,6 +9,11 @@ Patch the netgen 4.5 distribution: $ cd netgen45 $ patch -p1 < patch_directory/netgen45ForSalome.patch +Set CASROOT environment variable to OCCT installation path, +as Netgen 4.5 uses Open CASCADE Technology: + +$ setenv CASROOT + Then run makeForSalome.sh (it will be created by the patch): $ sh makeForSalome.sh @@ -72,7 +77,7 @@ nglib.o and ngnewdelete.o to the library libnginterface.a and recompile the libraries only. All this job is done by applying the patch and running the script makeForSalome.sh. -Th suggested patch alters some Netgen sources to compile them. +The suggested patch alters some Netgen sources to compile them. Michael SAZONOV m-sazonov@opencascade.com diff --git a/src/NETGENPlugin/Makefile.in b/src/NETGENPlugin/Makefile.in index 10a6742..920838d 100644 --- a/src/NETGENPlugin/Makefile.in +++ b/src/NETGENPlugin/Makefile.in @@ -52,6 +52,9 @@ LIB_SERVER_IDL = NETGENPlugin_Algorithm.idl LIB_CLIENT_IDL = \ SALOME_Component.idl \ SALOME_Comm.idl \ + SALOME_Exception.idl \ + SALOME_GenericObj.idl \ + SMESH_Hypothesis.idl \ GEOM_Gen.idl \ MED.idl @@ -61,6 +64,6 @@ LIB = libNETGENEngine.la NETGEN_INCLUDES = @NETGEN_INCLUDES@ CPPFLAGS += $(NETGEN_INCLUDES) CXXFLAGS += $(NETGEN_INCLUDES) -LDFLAGS += -lNETGEN +LDFLAGS += -L${NETGENPLUGIN_ROOT_DIR}/lib@LIB_LOCATION_SUFFIX@/salome -lNETGEN @CONCLUDE@ diff --git a/src/NETGENPlugin/NETGENPlugin_i.cxx b/src/NETGENPlugin/NETGENPlugin_i.cxx index db6b3ad..0f01ec2 100644 --- a/src/NETGENPlugin/NETGENPlugin_i.cxx +++ b/src/NETGENPlugin/NETGENPlugin_i.cxx @@ -40,8 +40,6 @@ template class NETGENPlugin_Creator_i:public HypothesisCreator_i virtual std::string GetModuleName() { return "NETGENPlugin"; } }; -using namespace std; - //============================================================================= /*! *