Attachment #114659 for bug #155974

View | Details | Raw Unified | Return to bug 155974 | Differences between

and this patch

Lines 360-366 Link Here

(-)NETGENPLUGIN_SRC_3.2.2/configure.in.base (-1 / +1 lines)
360	fi	360	fi
361		361
362	# make other build directories	362	# make other build directories
363	for rep in salome_adm adm_local doc bin/salome include/salome lib/salome share/salome/resources/${MODULE_NAME} idl	363	for rep in salome_adm adm_local doc bin/salome include/salome lib${LIB_LOCATION_SUFFIX}/salome share/salome/resources/${MODULE_NAME} idl
364	do	364	do
365	# if test ! -d $rep ; then	365	# if test ! -d $rep ; then
366	# eval mkdir $rep	366	# eval mkdir $rep






LIBS=@LIBS@ 
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++


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@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)

prefix=@prefix@
exec_prefix=@exec_prefix@
bindir=@bindir@/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

Lines 46-52 Link Here

(-)NETGENPLUGIN_SRC_3.2.2/idl/Makefile.in (-1 / +1 lines)
46	# python wrap	46	# python wrap
47	lib: pyidl	47	lib: pyidl
48		48
49	PYTHON_BUILD_SITE=$(top_builddir)/lib/python$(PYTHON_VERSION)/site-packages/@PACKAGE@	49	PYTHON_BUILD_SITE=$(top_builddir)/lib@LIB_LOCATION_SUFFIX@/python$(PYTHON_VERSION)/site-packages/@PACKAGE@
50		50
51	pyidl: $(PYTHON_BUILD_SITE) $(IDL_FILES:%.idl=$(PYTHON_BUILD_SITE)/%_idl.py)	51	pyidl: $(PYTHON_BUILD_SITE) $(IDL_FILES:%.idl=$(PYTHON_BUILD_SITE)/%_idl.py)
52		52

Lines 67-74 Link Here

(-)NETGENPLUGIN_SRC_3.2.2/src/GUI/Makefile.in (-3 / +2 lines)
67	CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome \	67	CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome \
68	-I${GEOM_ROOT_DIR}/include/salome -I${SMESH_ROOT_DIR}/include/salome	68	-I${GEOM_ROOT_DIR}/include/salome -I${SMESH_ROOT_DIR}/include/salome
69		69
70	LDFLAGS += -lSMESH $(OCC_KERNEL_LIBS) -L${KERNEL_ROOT_DIR}/lib/salome \	70	LDFLAGS += $(OCC_KERNEL_LIBS) $(KERNEL_LDFLAGS) $(GUI_LDFLAGS) ${GEOM_LDFLAGS} ${SMESH_LDFLAGS} -lSMESH
71	-L${GUI_ROOT_DIR}/lib/salome -L${GEOM_ROOT_DIR}/lib/salome \	71
72	-L${SMESH_ROOT_DIR}/lib/salome
73		72
74	@CONCLUDE@	73	@CONCLUDE@

Lines 42-48 Link Here

(-)NETGENPLUGIN_SRC_3.2.2/src/NETGEN/netgen45ForSalome.patch (-1 / +1 lines)
42	include $(LIBSRC_DIR)/makefile.mach.$(MACHINE)	42	include $(LIBSRC_DIR)/makefile.mach.$(MACHINE)
43	#	43	#
44	-CPLUSPLUSFLAGS1 = -c -I$(LIBSRC_DIR)/include -I$(OCCINC_DIR)	44	-CPLUSPLUSFLAGS1 = -c -I$(LIBSRC_DIR)/include -I$(OCCINC_DIR)
45	+CPLUSPLUSFLAGS1 = -c -I$(LIBSRC_DIR)/include -I$(OCCINC_DIR) \	45	+CPLUSPLUSFLAGS1 = -c -fPIC -I$(LIBSRC_DIR)/include -I$(OCCINC_DIR) \
46	+ -DOCCGEOMETRY -DOCC52 -DHAVE_IOSTREAM -DHAVE_LIMITS	46	+ -DOCCGEOMETRY -DOCC52 -DHAVE_IOSTREAM -DHAVE_LIMITS
47	#	47	#
48	ARFLAGS = r	48	ARFLAGS = r

Lines 52-57 Link Here

(-)NETGENPLUGIN_SRC_3.2.2/src/NETGENPlugin/Makefile.in (-1 / +4 lines)
52	LIB_CLIENT_IDL = \	52	LIB_CLIENT_IDL = \
53	SALOME_Component.idl \	53	SALOME_Component.idl \
54	SALOME_Comm.idl \	54	SALOME_Comm.idl \
		55	SALOME_Exception.idl \
		56	SALOME_GenericObj.idl \
		57	SMESH_Hypothesis.idl \
55	GEOM_Gen.idl \	58	GEOM_Gen.idl \
56	MED.idl	59	MED.idl
57		60
Lines 61-66 Link Here
61	NETGEN_INCLUDES = @NETGEN_INCLUDES@	64	NETGEN_INCLUDES = @NETGEN_INCLUDES@
62	CPPFLAGS += $(NETGEN_INCLUDES)	65	CPPFLAGS += $(NETGEN_INCLUDES)
63	CXXFLAGS += $(NETGEN_INCLUDES)	66	CXXFLAGS += $(NETGEN_INCLUDES)
64	LDFLAGS += -lNETGEN	67	LDFLAGS += -L${NETGENPLUGIN_ROOT_DIR}/lib@LIB_LOCATION_SUFFIX@/salome -lNETGEN
65		68
66	@CONCLUDE@	69	@CONCLUDE@

Return to bug 155974

Lines 12-18 Link Here

(-)NETGENPLUGIN_SRC_3.2.2/adm_local/unix/make_commence.in (-3 / +3 lines)
12		12
13		13
14	LIBS=@LIBS@	14	LIBS=@LIBS@
15	LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib/salome -Xlinker -rpath-link -Xlinker $(top_builddir)/lib/salome	15	LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome -Xlinker -rpath-link -Xlinker $(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome
16	# add libstdc++ to link c++ library with libtool !	16	# add libstdc++ to link c++ library with libtool !
17	LDFLAGS+= -lstdc++	17	LDFLAGS+= -lstdc++
18		18
Lines 175-181 Link Here
175	CPPFLAGS += -DSOLIDGEOM -DLINUX $(OCC_INCLUDES) $(SALOME_INCLUDES) $(BOOST_CPPFLAGS)	175	CPPFLAGS += -DSOLIDGEOM -DLINUX $(OCC_INCLUDES) $(SALOME_INCLUDES) $(BOOST_CPPFLAGS)
176	CXXFLAGS += -DSOLIDGEOM -DLINUX $(OCC_CXXFLAGS) $(SALOME_INCLUDES)	176	CXXFLAGS += -DSOLIDGEOM -DLINUX $(OCC_CXXFLAGS) $(SALOME_INCLUDES)
177		177
178	LDFLAGS += -lSMESHimpl -lSMESHEngine -lStdMeshers -lStdMeshersEngine -L${KERNEL_ROOT_DIR}/lib/salome -L${SMESH_ROOT_DIR}/lib/salome -L${GEOM_ROOT_DIR}/lib/salome -lSalomeGenericObj	178	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
179		179
180	# add corba libs when link salome application !	180	# add corba libs when link salome application !
181	#LDFLAGS+= $(CORBA_LIBS)	181	#LDFLAGS+= $(CORBA_LIBS)
Lines 205-211 Link Here
205	prefix=@prefix@	205	prefix=@prefix@
206	exec_prefix=@exec_prefix@	206	exec_prefix=@exec_prefix@
207	bindir=@bindir@/salome	207	bindir=@bindir@/salome
208	libdir=@libdir@/salome	208	libdir=@exec_prefix@/lib@LIB_LOCATION_SUFFIX@/salome
209	# warning : if user give this path in configure we could have salome/salome :-(	209	# warning : if user give this path in configure we could have salome/salome :-(
210	includedir=@includedir@/salome	210	includedir=@includedir@/salome
211	datadir=@datadir@/salome	211	datadir=@datadir@/salome