ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-01-27 11:00:32 +05:00
Code Issues Packages Projects Releases Wiki Activity

Porting to 64bit platform

Browse Source
This commit is contained in:
enk 2006-05-25 13:35:05 +00:00
parent a166931ff3
commit 76557151c7
26 changed files with 218 additions and 174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
adm_local/unix/config_files/check_SMESH.m4
View File

@ -9,6 +9,9 @@ AC_CHECKING(for SMesh)
SMesh_ok=no
SMESH_LDFLAGS=""
SMESH_CXXFLAGS=""
AC_ARG_WITH(smesh,
[ --with-smesh=DIR root directory path of SMESH installation ],
SMESH_DIR="$withval",SMESH_DIR="")
@ -44,6 +47,12 @@ if test -f ${SMESH_DIR}/bin/salome/libSMESH_Swig.py ; then
fi
AC_SUBST(SMESH_ROOT_DIR)
SMESH_LDFLAGS=-L${SMESH_DIR}/lib${LIB_LOCATION_SUFFIX}/salome
SMESH_CXXFLAGS=-I${SMESH_DIR}/include/salome
AC_SUBST(SMESH_LDFLAGS)
AC_SUBST(SMESH_CXXFLAGS)
else
AC_MSG_WARN("Cannot find compiled SMesh module distribution")
fi

63
adm_local/unix/make_commence.in
View File

@ -11,8 +11,8 @@ HAVE_SSTREAM=@HAVE_SSTREAM@
LIBS=@LIBS@
LIBSFORBIN=@LIBS@
LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib/salome -Xlinker -rpath-link -Xlinker $(top_builddir)/lib/salome
LDFLAGSFORBIN=@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
LDFLAGSFORBIN=@LDFLAGS@ -L$(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome -Xlinker -rpath-link -Xlinker
# add libstdc++ to link c++ library with libtool !
LDFLAGS+= -lstdc++
LDFLAGSFORBIN+= -lstdc++
@ -54,8 +54,8 @@ PYTHONHOME = @PYTHONHOME@
PYTHON_INCLUDES = @PYTHON_INCLUDES@
PYTHON_LIBS = @PYTHON_LIBS@
PYTHON_VERSION = @PYTHON_VERSION@
PYTHON_SITE = @PYTHON_SITE@
PYTHON_SITE_INSTALL = @PYTHON_SITE_INSTALL@
PYTHON_SITE = $(prefix)/lib@LIB_LOCATION_SUFFIX@/python$(PYTHON_VERSION)/site-packages
PYTHON_SITE_INSTALL = $(prefix)/lib@LIB_LOCATION_SUFFIX@/python$(PYTHON_VERSION)/site-packages/salome
# QT
@ -192,16 +192,33 @@ INSTALL_DATA=@INSTALL_DATA@
# create a symbolic link (or a copie ?)
LN_S=@LN_S@
KERNEL_ROOT_DIR=@KERNEL_ROOT_DIR@
KERNEL_SITE_DIR=@KERNEL_SITE_DIR@
KERNEL_LDFLAGS=@KERNEL_LDFLAGS@
KERNEL_CXXFLAGS=@KERNEL_CXXFLAGS@
GUI_ROOT_DIR=@GUI_ROOT_DIR@
GUI_LDFLAGS=@GUI_LDFLAGS@
GUI_CXXFLAGS=@GUI_CXXFLAGS@
MED_ROOT_DIR=@MED_ROOT_DIR@
MED_LDFLAGS=@MED_LDFLAGS@
MED_CXXFLAGS=@MED_CXXFLAGS@
GEOM_ROOT_DIR=@GEOM_ROOT_DIR@
GEOM_LDFLAGS=@GEOM_LDFLAGS@
GEOM_CXXFLAGS=@GEOM_CXXFLAGS@
## Installation points
prefix=@prefix@
exec_prefix=@exec_prefix@
bindir=@bindir@/salome
libdir=@libdir@/salome
bindir=@exec_prefix@/bin/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
idldir=$(prefix)/idl/salome
sharedpydir=@libdir@/python$(PYTHON_VERSION)/site-packages/salome/shared_modules
sharedpydir=@exec_prefix@/lib@LIB_LOCATION_SUFFIX@/python$(PYTHON_VERSION)/site-packages/salome/shared_modules
docdir=${prefix}/doc/salome
@ -250,17 +267,31 @@ $(top_srcdir)/configure.in: $(top_srcdir)/configure.in.base
ACLOCAL_KERNEL = \
ac_cxx_bool.m4 check_corba.m4 \
ac_cxx_depend_flag.m4 check_hdf5.m4 enable_pthreads.m4 \
ac_cxx_mutable.m4 check_mico.m4 libtool.m4 \
ac_cxx_namespaces.m4 check_omniorb.m4 pyembed.m4 \
ac_cxx_partial_specialization.m4 python.m4 \
ac_cxx_typename.m4 check_pthreads.m4 check_cas.m4 \
ac_cc_warnings.m4 check_boost.m4 check_swig.m4
ac_cxx_bool.m4 \
check_corba.m4 \
ac_cxx_depend_flag.m4 \
check_hdf5.m4 \
enable_pthreads.m4 \
ac_cxx_mutable.m4 \
check_mico.m4 \
ac_cxx_namespaces.m4 \
check_omniorb.m4 \
pyembed.m4 \
ac_cxx_partial_specialization.m4 \
python.m4 \
ac_cxx_typename.m4 \
check_pthreads.m4 \
check_cas.m4 \
ac_cc_warnings.m4 \
check_boost.m4 \
check_swig.m4
ACLOCAL_GUI = \
check_vtk.m4 check_opengl.m4 check_qt.m4 \
check_GUI.m4 check_corba_in_GUI.m4
check_vtk.m4 \
check_opengl.m4 \
check_qt.m4 \
check_GUI.m4 \
check_corba_in_GUI.m4
ACLOCAL_MED = check_Med.m4
ACLOCAL_GEOM = check_GEOM.m4

20
adm_local/unix/make_conclude.in
View File

@ -35,9 +35,9 @@ LIB_OBJ_F = $(patsubst %.f, %.lo, $(filter %.f, $(LIB_SRC)))
# all libtool obj file in library
LIB_OBJ = $(LIB_OBJ_CXX) $(LIB_OBJ_CC) $(LIB_OBJ_C) $(LIB_CLIENT_OBJ:%.o=%.lo) $(LIB_SERVER_OBJ:%.o=%.lo) $(LIB_SWIG_OBJ) $(LIB_OBJ_F)
# LIB_BUILD = $(LIB:%.la=$(top_builddir)/lib/salome/%.la)
LIB_BUILD = $(patsubst %.la, $(top_builddir)/lib/salome/%.la, $(filter %.la, $(LIB)))
LIB_BUILD_A = $(patsubst %.a, $(top_builddir)/lib/salome/%.a, $(filter %.a, $(LIB)))
# LIB_BUILD = $(LIB:%.la=$(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome/%.la)
LIB_BUILD = $(patsubst %.la, $(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome/%.la, $(filter %.la, $(LIB)))
LIB_BUILD_A = $(patsubst %.a, $(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome/%.a, $(filter %.a, $(LIB)))
ifneq ($(findstring cmodule.la,$(filter %.la, $(LIB))),)
LIB_SWIG = $(patsubst %cmodule.la,%.so, $(filter %.la, $(LIB)))
@ -48,7 +48,7 @@ endif
lib: $(LIB_BUILD) $(LIB_CLIENT_PY)
# we don't build static library !
$(LIB_BUILD): $(top_builddir)/lib/salome/%.la: %.la
$(LIB_BUILD): $(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome/%.la: %.la
-$(RM) $@
-$(RM) $(patsubst %.la, %.so, $@)
-$(RM) $(patsubst %.la, %.a, $@)
@ -59,10 +59,10 @@ $(LIB_BUILD): $(top_builddir)/lib/salome/%.la: %.la
$(patsubst %.la, %.so, $@).0 || true
if ! test -z $(LIB_SWIG) ; then \
ln -sf $(patsubst %.la,%.so, $(CURDIR)/.libs/$<) $(top_builddir)/lib/salome/_$(LIB_SWIG) || true;\
ln -sf $(patsubst %.la,%.so, $(CURDIR)/.libs/$<) $(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome/_$(LIB_SWIG) || true;\
fi;
$(LIB_BUILD_A): $(top_builddir)/lib/salome/%.a: %.a
$(LIB_BUILD_A): $(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome/%.a: %.a
-$(RM) $@
ln -sf $(CURDIR)/$< $@ || true
@ -106,7 +106,7 @@ $(DEST_PYSCRIPTS): $(top_builddir)/bin/salome/%: %
# copy pyqt files in $(PYTHON_SHARED_SITE)
#
PYTHON_SHARED_SITE=$(top_builddir)/lib/python$(PYTHON_VERSION)/site-packages/salome/shared_modules
PYTHON_SHARED_SITE=$(top_builddir)/lib@LIB_LOCATION_SUFFIX@/python$(PYTHON_VERSION)/site-packages/salome/shared_modules
$(PYTHON_SHARED_SITE):
$(INSTALL) -d $@
@ -260,10 +260,10 @@ clean: mostlyclean
-$(RM) $(LIB) $(TEST_PROGS) $(BIN) $(CLEAN)
-$(RM) TAGS *~ *# core *.core
-$(RM) -r .libs
-$(RM) $(top_builddir)/lib/salome/$(LIB)
-$(RM) $(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome/$(LIB)
-$(RM) $(patsubst %,$(top_builddir)/bin/salome/%, $(BIN))
-$(RM) $(patsubst %.la, %.so, $(top_builddir)/lib/salome/$(LIB))
-$(RM) $(patsubst %.la, %.a, $(top_builddir)/lib/salome/$(LIB))
-$(RM) $(patsubst %.la, %.so, $(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome/$(LIB))
-$(RM) $(patsubst %.la, %.a, $(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome/$(LIB))
# remove idl generated files (sources)
-$(RM) $(LIB_CLIENT_SRC) $(LIB_SERVER_SRC) $(BIN_CLIENT_SRC) $(BIN_SERVER_SRC)
# remove idl generated files (headers)

16
configure.in.base
View File

@ -113,13 +113,7 @@ dnl
AC_CXX_HAVE_SSTREAM
echo
echo ---------------------------------------------
echo BOOST Library
echo ---------------------------------------------
echo
CHECK_BOOST
dnl
dnl ---------------------------------------------
@ -249,6 +243,14 @@ echo
CHECK_HDF5
echo
echo ---------------------------------------------
echo BOOST Library
echo ---------------------------------------------
echo
CHECK_BOOST
echo
echo ---------------------------------------------
echo Testing OpenCascade
@ -346,7 +348,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 idl
do
# if test ! -d $rep ; then
# eval mkdir $rep

2
idl/Makefile.in
View File

@ -53,7 +53,7 @@ $(IDL_FILES:%=$(top_builddir)/idl/salome/%):$(IDL_FILES:%=$(top_srcdir)/idl/%)
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)

6
src/Controls/Makefile.in
View File

@ -43,10 +43,10 @@ LIB_SRC = SMESH_Controls.cxx
BIN = SMESHControls
BIN_SRC =
CPPFLAGS+=$(OCC_INCLUDES) $(BOOST_CPPFLAGS) -I${KERNEL_ROOT_DIR}/include/salome
CPPFLAGS+=$(OCC_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS)
LDFLAGS+=$(OCC_KERNEL_LIBS) -L${KERNEL_ROOT_DIR}/lib/salome -lOpUtil -lSMDS -lTKBRep -lTKG3d
LDFLAGS+=$(OCC_KERNEL_LIBS) $(KERNEL_LDFLAGS) -lOpUtil -lSMDS -lTKBRep -lTKG3d
LDFLAGSFORBIN += -lSMDS -L${KERNEL_ROOT_DIR}/lib/salome -lOpUtil -lSALOMELocalTrace -lSALOMEBasics $(OCC_KERNEL_LIBS) -lTKBRep -lTKG3d
LDFLAGSFORBIN += -lSMDS $(KERNEL_LDFLAGS) -lOpUtil -lSALOMELocalTrace -lSALOMEBasics $(OCC_KERNEL_LIBS) -lTKBRep -lTKG3d
@CONCLUDE@

2
src/Driver/Makefile.in
View File

@ -51,7 +51,7 @@ LIB_SERVER_IDL =
CPPFLAGS +=
CXXFLAGS +=
LDFLAGS += $(OCC_KERNEL_LIBS) -lTKTopAlgo -lSMESHDS -L${KERNEL_ROOT_DIR}/lib/salome -lOpUtil
LDFLAGS += $(OCC_KERNEL_LIBS) -lTKTopAlgo -lSMESHDS $(KERNEL_LDFLAGS) -lOpUtil
@CONCLUDE@

6
src/DriverDAT/Makefile.in
View File

@ -49,11 +49,11 @@ LIB_CLIENT_IDL =
LIB_SERVER_IDL =
# additionnal information to compil and link file
CPPFLAGS += -I${KERNEL_ROOT_DIR}/include/salome $(OCC_INCLUDES) $(BOOST_CPPFLAGS)
CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome
CPPFLAGS += $(KERNEL_CXXFLAGS) $(OCC_INCLUDES) $(BOOST_CPPFLAGS)
CXXFLAGS += $(KERNEL_CXXFLAGS)
LDFLAGS += -lMeshDriver $(OCC_KERNEL_LIBS)
LDFLAGSFORBIN += -lMeshDriver -lSMDS -L${KERNEL_ROOT_DIR}/lib/salome -lOpUtil -lSALOMELocalTrace -lSALOMEBasics
LDFLAGSFORBIN += -lMeshDriver -lSMDS $(KERNEL_LDFLAGS) -lOpUtil -lSALOMELocalTrace -lSALOMEBasics
@CONCLUDE@

8
src/DriverMED/Makefile.in
View File

@ -59,11 +59,11 @@ LIB_CLIENT_IDL =
LIB_SERVER_IDL =
# additionnal information to compil and link file
CPPFLAGS += $(OCC_INCLUDES) -I${MED_ROOT_DIR}/include/salome $(BOOST_CPPFLAGS)
CXXFLAGS += $(OCC_CXXFLAGS) $(HDF5_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome
LDFLAGS += -lMeshDriver -L${MED_ROOT_DIR}/lib/salome -lMEDWrapper
CPPFLAGS += $(OCC_INCLUDES) $(MED_CXXFLAGS) $(BOOST_CPPFLAGS)
CXXFLAGS += $(OCC_CXXFLAGS) $(HDF5_INCLUDES) $(KERNEL_CXXFLAGS)
LDFLAGS += -lMeshDriver $(MED_LDFLAGS) -lMEDWrapper
LDFLAGSFORBIN += -lMeshDriver -lSMDS -lSMESHDS -L${KERNEL_ROOT_DIR}/lib/salome -L${MED_ROOT_DIR}/lib/salome -lMEDWrapper -lMEDWrapperBase -lMEDWrapper_V2_1 -lmed_V2_1 -lMEDWrapper_V2_2 -lOpUtil -lSALOMELocalTrace -lSALOMEBasics
LDFLAGSFORBIN += -lMeshDriver -lSMDS -lSMESHDS $(KERNEL_LDFLAGS) $(MED_LDFLAGS) -lMEDWrapper -lMEDWrapperBase -lMEDWrapper_V2_1 -lmed_V2_1 -lMEDWrapper_V2_2 -lOpUtil -lSALOMELocalTrace -lSALOMEBasics
@CONCLUDE@

6
src/DriverSTL/Makefile.in
View File

@ -49,11 +49,11 @@ LIB_CLIENT_IDL =
LIB_SERVER_IDL =
# additionnal information to compil and link file
CPPFLAGS += $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome $(BOOST_CPPFLAGS)
CXXFLAGS += $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome
CPPFLAGS += $(OCC_INCLUDES) $(KERNEL_CXXFLAGS) $(BOOST_CPPFLAGS)
CXXFLAGS += $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS)
LDFLAGS += $(OCC_KERNEL_LIBS) -lMeshDriver -lTKSTL -lTKTopAlgo -lTKMesh
LDFLAGSFORBIN += -lMeshDriver -lSMDS -L${KERNEL_ROOT_DIR}/lib/salome -lOpUtil -lSALOMELocalTrace -lSALOMEBasics $(OCC_KERNEL_LIBS) -lTKSTL -lTKTopAlgo -lTKMesh -lTKBO
LDFLAGSFORBIN += -lMeshDriver -lSMDS $(KERNEL_LDFLAGS) -lOpUtil -lSALOMELocalTrace -lSALOMEBasics $(OCC_KERNEL_LIBS) -lTKSTL -lTKTopAlgo -lTKMesh -lTKBO
@CONCLUDE@

6
src/DriverUNV/Makefile.in
View File

@ -61,11 +61,11 @@ LIB_CLIENT_IDL =
LIB_SERVER_IDL =
# additionnal information to compil and link file
CPPFLAGS += -I${KERNEL_ROOT_DIR}/include/salome $(OCC_INCLUDES) $(BOOST_CPPFLAGS)
CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome
CPPFLAGS += $(KERNEL_CXXFLAGS) $(OCC_INCLUDES) $(BOOST_CPPFLAGS)
CXXFLAGS += $(KERNEL_CXXFLAGS)
LDFLAGS += -lMeshDriver $(OCC_KERNEL_LIBS)
LDFLAGSFORBIN += -lMeshDriver -lSMDS -L${KERNEL_ROOT_DIR}/lib/salome -lOpUtil -lSALOMELocalTrace -lSALOMEBasics
LDFLAGSFORBIN += -lMeshDriver -lSMDS $(KERNEL_LDFLAGS) -lOpUtil -lSALOMELocalTrace -lSALOMEBasics
@CONCLUDE@

4
src/MEFISTO2/Makefile.in
View File

@ -42,8 +42,8 @@ LIB_CLIENT_IDL =
LIB_SERVER_IDL =
# additionnal information to compil and link file
CPPFLAGS += $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome
CXXFLAGS += $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome
CPPFLAGS += $(OCC_INCLUDES) $(KERNEL_CXXFLAGS)
CXXFLAGS += $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS)
ifeq ($(F77),gfortran)
LDFLAGS += -lgfortran

2
src/Makefile.in
View File

@ -31,6 +31,8 @@ VPATH=.:@srcdir@
@COMMENCE@
MED_CXXFLAGS=@MED_CXXFLAGS@
SUBDIRS = \
SMDS SMESHDS Controls Driver DriverMED DriverDAT DriverUNV DriverSTL \
SMESH SMESH_I SMESHClient OBJECT SMESHFiltersSelection SMESHGUI SMESH_SWIG \

10
src/NETGENPlugin/Makefile.in
View File

@ -57,11 +57,11 @@ BIN_SRC =
# additionnal information to compil and link file
NETGEN_INCLUDES=@NETGEN_INCLUDES@
CPPFLAGS+= $(OCC_INCLUDES) $(HDF5_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome \
-I${GEOM_ROOT_DIR}/include/salome $(NETGEN_INCLUDES) $(BOOST_CPPFLAGS)
CXXFLAGS+= $(OCC_CXXFLAGS) $(HDF5_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome \
-I${GEOM_ROOT_DIR}/include/salome $(NETGEN_INCLUDES)
CPPFLAGS+= $(OCC_INCLUDES) $(HDF5_INCLUDES) $(KERNEL_CXXFLAGS) \
$(GEOM_CXXFLAGS) $(NETGEN_INCLUDES) $(BOOST_CPPFLAGS)
CXXFLAGS+= $(OCC_CXXFLAGS) $(HDF5_INCLUDES) $(KERNEL_CXXFLAGS) \
$(GEOM_CXXFLAGS) $(NETGEN_INCLUDES)
LDFLAGS+= $(HDF5_LIBS) -lSMESHimpl -lSMESHEngine -lStdMeshers -lStdMeshersEngine -lNETGEN -L${KERNEL_ROOT_DIR}/lib/salome -L${GEOM_ROOT_DIR}/lib/salome -lSalomeGenericObj
LDFLAGS+= $(HDF5_LIBS) -lSMESHimpl -lSMESHEngine -lStdMeshers -lStdMeshersEngine -lNETGEN $(KERNEL_LDFLAGS) $(GEOM_LDFLAGS) -lSalomeGenericObj
@CONCLUDE@

16
src/OBJECT/Makefile.in
View File

@ -65,17 +65,19 @@ BIN =
BIN_SRC =
CPPFLAGS+= \
-I${KERNEL_ROOT_DIR}/include/salome \
-I${GUI_ROOT_DIR}/include/salome \
$(KERNEL_CXXFLAGS) \
$(GUI_CXXFLAGS) \
$(OCC_INCLUDES) \
$(VTK_INCLUDES) \
$(BOOST_CPPFLAGS) \
$(QT_INCLUDES)
$(QT_INCLUDES) \
$(MED_CXXFLAGS)
LDFLAGS+= \
-L${KERNEL_ROOT_DIR}/lib/salome \
-L${GUI_ROOT_DIR}/lib/salome \
$(KERNEL_LDFLAGS) \
$(GUI_LDFLAGS) \
$(OCC_KERNEL_LIBS) \
$(VTK_LIBS) \
$(MED_LDFLAGS) \
-lSMDS \
-lSMESHClient \
-lSalomeApp \
@ -83,8 +85,8 @@ LDFLAGS+= \
-lSMESHControls
LDFLAGSFORBIN += \
-L${GEOM_ROOT_DIR}/lib/salome \
-L${MED_ROOT_DIR}/lib/salome \
$(GEOM_LDFLAGS) \
$(MED_LDFLAGS) \
$(LDFLAGS) \
-lqtx \
-lsuit \

7
src/SMDS/Makefile.in
View File

@ -29,6 +29,7 @@ top_srcdir=@top_srcdir@
top_builddir=../..
srcdir=@srcdir@
VPATH=.:@srcdir@:@top_srcdir@/idl
KERNEL_CXXFLAGS=@KERNEL_CXXFLAGS@
@COMMENCE@
@ -109,9 +110,9 @@ EXPORT_HEADERS= \
SMDS_SetIterator.hxx
# additionnal information to compil and link file
CPPFLAGS += -I${KERNEL_ROOT_DIR}/include/salome $(OCC_INCLUDES) $(BOOST_CPPFLAGS)
CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome
LDFLAGS += -L${KERNEL_ROOT_DIR}/lib/salome $(OCC_KERNEL_LIBS)
CPPFLAGS += $(KERNEL_CXXFLAGS) $(OCC_INCLUDES) $(BOOST_CPPFLAGS)
CXXFLAGS += $(KERNEL_CXXFLAGS)
LDFLAGS += $(KERNEL_LDFLAGS) $(OCC_KERNEL_LIBS)
# additional file to be cleaned

12
src/SMESH/Makefile.in
View File

@ -70,7 +70,7 @@ LIB_SRC = SMESH_Gen.cxx SMESH_Mesh.cxx SMESH_subMesh.cxx \
SMESH_MeshEditor.cxx \
SMESH_Block.cxx \
SMESH_Pattern.cxx \
SMESH_HypoFilter.cxx \
SMESH_HypoFilter.cxx \
SMESH_MesherHelper.cxx
LIB_SERVER_IDL =
@ -82,11 +82,11 @@ BIN =
BIN_SRC =
# additionnal information to compile and link file
CPPFLAGS+= $(OCC_INCLUDES) $(HDF5_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome \
-I${MED_ROOT_DIR}/include/salome -I${GEOM_ROOT_DIR}/include/salome $(BOOST_CPPFLAGS)
CXXFLAGS+= $(OCC_CXXFLAGS) $(HDF5_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome \
-I${MED_ROOT_DIR}/include/salome -I${GEOM_ROOT_DIR}/include/salome
LDFLAGS+= -L${KERNEL_ROOT_DIR}/lib/salome -L${GEOM_ROOT_DIR}/lib/salome -L${MED_ROOT_DIR}/lib/salome -L${OCC_KERNEL_LIBS} $(OCC_LDPATH)-lNMTTools -lSMESHDS -lMeshDriverDAT -lMeshDriverSTL -lMeshDriverMED -lMeshDriverUNV -lTKShHealing
CPPFLAGS+= $(OCC_INCLUDES) $(HDF5_INCLUDES) $(KERNEL_CXXFLAGS) \
$(MED_CXXFLAGS) $(GEOM_CXX_FLAGS) $(BOOST_CPPFLAGS)
CXXFLAGS+= $(OCC_CXXFLAGS) $(HDF5_INCLUDES) $(KERNEL_CXXFLAGS) \
$(MED_CXXFLAGS) $(GEOM_CXX_FLAGS)
LDFLAGS+= $(KERNEL_LDFLAGS) $(GEOM_LDFLAGS) $(MED_LDFLAGS) -lNMTTools -lSMESHDS -lMeshDriverDAT -lMeshDriverSTL -lMeshDriverMED -lMeshDriverUNV
@CONCLUDE@

77
src/SMESHClient/Makefile.in
View File

@ -43,19 +43,19 @@ LIB = libSMESHClient.la
LIB_SRC = SMESH_Client.cxx
LIB_CLIENT_IDL = SALOME_Comm.idl \
SALOME_Component.idl \
SALOMEDS.idl \
SALOMEDS_Attributes.idl \
SALOME_Exception.idl \
SALOME_GenericObj.idl \
SMESH_Mesh.idl \
SMESH_Gen.idl \
SMESH_Group.idl \
SMESH_Hypothesis.idl \
SMESH_Pattern.idl \
SMESH_Filter.idl \
GEOM_Gen.idl \
MED.idl
SALOME_Component.idl \
SALOMEDS.idl \
SALOMEDS_Attributes.idl \
SALOME_Exception.idl \
SALOME_GenericObj.idl \
SMESH_Mesh.idl \
SMESH_Gen.idl \
SMESH_Group.idl \
SMESH_Hypothesis.idl \
SMESH_Pattern.idl \
SMESH_Filter.idl \
GEOM_Gen.idl \
MED.idl
# Executables targets
BIN = SMESHClientBin
@ -64,32 +64,33 @@ BIN_CLIENT_IDL =
BIN_SERVER_IDL =
# additionnal information to compil and link file
CPPFLAGS += $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome $(BOOST_CPPFLAGS)
CXXFLAGS += $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome
CPPFLAGS += $(OCC_INCLUDES) $(KERNEL_CXXFLAGS) $(BOOST_CPPFLAGS)
CXXFLAGS += $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS)
LDFLAGS += $(OCC_KERNEL_LIBS) \
-L${KERNEL_ROOT_DIR}/lib/salome \
-L${GEOM_ROOT_DIR}/lib/salome \
-L${MED_ROOT_DIR}/lib/salome \
-lSMDS \
-lSMESHimpl \
-lSMESHDS \
-lSMESHControls \
-lNMTTools \
-lNMTDS \
-lmed_V2_1 \
-lMEDWrapper \
-lMEDWrapperBase \
-lMEDWrapper_V2_1 \
-lMEDWrapper_V2_2 \
-lSalomeResourcesManager \
-lSalomeLifeCycleCORBA \
-lSalomeNotification \
-lSalomeContainer \
-lRegistry \
-lSalomeNS \
-lSALOMELocalTrace \
-lSALOMEBasics \
-lOpUtil
$(KERNEL_LDFLAGS) \
$(GEOM_LDFLAGS) \
$(MED_LDFLAGS) \
-lSMDS \
-lSMESHimpl \
-lSMESHDS \
-lSMESHControls \
-lNMTTools \
-lNMTDS \
-lmed_V2_1 \
-lMEDWrapper \
-lMEDWrapperBase \
-lMEDWrapper_V2_1 \
-lMEDWrapper_V2_2 \
-lSalomeResourcesManager \
-lSalomeLifeCycleCORBA \
-lSalomeNotification \
-lSalomeContainer \
-lRegistry \
-lSalomeNS \
-lSALOMELocalTrace \
-lSALOMEBasics \
-lOpUtil \
-lTKShHealing
LDFLAGSFORBIN += $(LDFLAGS)

4
src/SMESHDS/Makefile.in
View File

@ -70,8 +70,8 @@ EXPORT_HEADERS= \
SMESHDS_GroupOnGeom.hxx
# additionnal information to compil and link file
CPPFLAGS += $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome $(BOOST_CPPFLAGS)
CXXFLAGS += $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome
CPPFLAGS += $(OCC_INCLUDES) $(KERNEL_CXXFLAGS) $(BOOST_CPPFLAGS)
CXXFLAGS += $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS)
LDFLAGS += $(OCC_KERNEL_LIBS) -lSMDS

14
src/SMESHFiltersSelection/Makefile.in
View File

@ -41,7 +41,8 @@ LIB_SRC = SMESH_TypeFilter.cxx \
SMESH_NumberFilter.cxx \
SMESH_LogicalFilter.cxx
LIB_CLIENT_IDL = SALOME_Exception.idl \
LIB_CLIENT_IDL = SALOME_Comm.idl \
SALOME_Exception.idl \
GEOM_Gen.idl \
SMESH_Gen.idl \
SMESH_Mesh.idl \
@ -54,7 +55,6 @@ LIB_CLIENT_IDL = SALOME_Exception.idl \
SMESH_Filter.idl \
SMESH_Pattern.idl \
SALOME_GenericObj.idl \
SALOME_Comm.idl \
MED.idl
# header files
@ -65,11 +65,11 @@ EXPORT_HEADERS= SMESH_Type.h \
# additionnal information to compil and link file
CPPFLAGS += $(OCC_INCLUDES) $(QT_INCLUDES) $(PYTHON_INCLUDES) $(VTK_INCLUDES) \
-I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome \
-I${GEOM_ROOT_DIR}/include/salome ${BOOST_CPPFLAGS}
CXXFLAGS += $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome \
-I${GEOM_ROOT_DIR}/include/salome -I${BOOSTDIR}
LDFLAGS += $(OCC_KERNEL_LIBS) -L${KERNEL_ROOT_DIR}/lib/salome -lSalomeDSClient -lSalomeDS -L${GUI_ROOT_DIR}/lib/salome -L${GEOM_ROOT_DIR}/lib/salome -lSalomeApp -lsuit
$(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) \
$(GEOM_CXXFLAGS) ${BOOST_CPPFLAGS}
CXXFLAGS += $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) \
$(GEOM_CXXFLAGS) -I${BOOSTDIR}
LDFLAGS += $(OCC_KERNEL_LIBS) $(KERNEL_LDFLAGS) -lSalomeDSClient -lSalomeDS $(GUI_LDFLAGS) $(GEOM_LDFLAGS) -lSalomeApp -lsuit
# additional file to be cleaned
MOSTLYCLEAN =

20
src/SMESHGUI/Makefile.in
View File

@ -107,9 +107,7 @@ LIB_SRC = SMESHGUI.cxx \
SMESHGUI_Displayer.cxx \
SMESHGUI_Hypotheses.cxx \
SMESHGUI_ShapeByMeshDlg.cxx \
SMESHGUI_AddQuadraticElementDlg.cxx \
SMESHGUI_ConvToQuadDlg.cxx \
SMESHGUI_ConvToQuadOp.cxx
SMESHGUI_AddQuadraticElementDlg.cxx
LIB_MOC = \
SMESHGUI.h \
@ -155,9 +153,7 @@ LIB_MOC = \
SMESHGUI_MeshOp.h \
SMESHGUI_Hypotheses.h \
SMESHGUI_ShapeByMeshDlg.h \
SMESHGUI_AddQuadraticElementDlg.h \
SMESHGUI_ConvToQuadDlg.h \
SMESHGUI_ConvToQuadOp.h
SMESHGUI_AddQuadraticElementDlg.h
LIB_CLIENT_IDL = SALOME_Exception.idl \
@ -183,16 +179,16 @@ LIB_SERVER_IDL =
#BIN = SMESHBin
CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) \
-I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome \
-I${GEOM_ROOT_DIR}/include/salome $(BOOST_CPPFLAGS)
$(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) \
$(GEOM_CXXFLAGS) $(BOOST_CPPFLAGS)
CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome \
-I${GEOM_ROOT_DIR}/include/salome
CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) \
$(GEOM_CXXFLAGS)
LDFLAGS += -lSMESHObject -lSMESHFiltersSelection -lSMDS -lSMESHControls -lDlgRef \
$(OCC_KERNEL_LIBS) -lTKBO -lTKAdvTools -L${KERNEL_ROOT_DIR}/lib/salome -L${GUI_ROOT_DIR}/lib/salome \
$(OCC_KERNEL_LIBS) -lTKBO -lTKAdvTools $(KERNEL_LDFLAGS) $(GUI_LDFLAGS) \
-lVTKViewer -lSalomeDSClient -lSalomeDS -lSalomeApp -lSalomePrs -lSalomeNS -lSalomeLifeCycleCORBA -lOpUtil -lSalomeObject \
-lEvent -lSALOMELocalTrace -lSVTK -lOCCViewer -L${GEOM_ROOT_DIR}/lib/salome -lGEOM -lGEOMClient \
-lEvent -lSALOMELocalTrace -lSVTK -lOCCViewer $(GEOM_LDFLAGS) -lGEOM -lGEOMClient \
-lGEOMBase -lGEOMObject -lGEOMFiltersSelection -lSalomeSession
LDFLAGSFORBIN += $(LDFLAGS)

49
src/SMESH_I/Makefile.in
View File

@ -60,15 +60,15 @@ LIB_SRC = \
SMESH_DumpPython.cxx \
SMESH_Mesh_i.cxx \
SMESH_MEDMesh_i.cxx \
SMESH_MEDFamily_i.cxx \
SMESH_MEDFamily_i.cxx \
SMESH_MEDSupport_i.cxx \
SMESH_subMesh_i.cxx \
SMESH_MeshEditor_i.cxx \
SMESH_Hypothesis_i.cxx \
SMESH_Algo_i.cxx \
SMESH_1D_Algo_i.cxx \
SMESH_2D_Algo_i.cxx \
SMESH_3D_Algo_i.cxx \
SMESH_subMesh_i.cxx \
SMESH_MeshEditor_i.cxx \
SMESH_Hypothesis_i.cxx \
SMESH_Algo_i.cxx \
SMESH_1D_Algo_i.cxx \
SMESH_2D_Algo_i.cxx \
SMESH_3D_Algo_i.cxx \
SMESH_Filter_i.cxx \
SMESH_Group_i.cxx \
SMESH_Pattern_i.cxx \
@ -78,9 +78,9 @@ LIB_SERVER_IDL = \
SMESH_Gen.idl \
SMESH_Hypothesis.idl \
SMESH_Mesh.idl \
SALOME_Component.idl \
SALOME_Component.idl \
SALOME_Exception.idl \
SMESH_Filter.idl \
SMESH_Filter.idl \
SMESH_Group.idl \
SMESH_Pattern.idl
@ -101,19 +101,20 @@ CPPFLAGS+= \
$(OCC_INCLUDES) \
$(HDF5_INCLUDES) \
$(BOOST_CPPFLAGS) \
-I${KERNEL_ROOT_DIR}/include/salome \
-I${MED_ROOT_DIR}/include/salome \
-I${GEOM_ROOT_DIR}/include/salome
$(KERNEL_CXXFLAGS) \
$(MED_CXXFLAGS) \
$(GEOM_CXXFLAGS)
CXXFLAGS+= \
$(OCC_INCLUDES) \
$(OCC_CXXFLAGS) \
$(HDF5_INCLUDES) \
-I${KERNEL_ROOT_DIR}/include/salome \
-I${MED_ROOT_DIR}/include/salome \
-I${GEOM_ROOT_DIR}/include/salome
$(KERNEL_CXXFLAGS) \
$(MED_CXXFLAGS) \
$(GEOM_CXXFLAGS)
LDFLAGS+= \
-L${KERNEL_ROOT_DIR}/lib/salome \
$(KERNEL_LDFLAGS) \
-lSalomeContainer \
-lSalomeNS \
-lRegistry \
@ -121,18 +122,19 @@ LDFLAGS+= \
-lSalomeLifeCycleCORBA \
-lTOOLSDS \
-lSalomeGenericObj \
-L${GEOM_ROOT_DIR}/lib/salome \
$(GEOM_LDFLAGS) \
-lGEOMClient \
-lSMESHimpl \
-lSMESHControls \
$(OCC_LDPATH) \
-lTKCDF \
-lTKBO
-lTKBO \
-lTKShHealing
LDFLAGSFORBIN+= \
-lSMDS \
-lSMESHDS \
-L${MED_ROOT_DIR}/lib/salome \
$(MED_LDFLAGS) \
-lMEDWrapper \
-lMEDWrapperBase \
-lMEDWrapper_V2_1 \
@ -143,7 +145,7 @@ LDFLAGSFORBIN+= \
-lMeshDriverUNV \
-lMeshDriverDAT \
-lMeshDriverSTL \
-L${KERNEL_ROOT_DIR}/lib/salome \
$(KERNEL_LDFLAGS) \
-lSalomeContainer \
-lSalomeNS \
-lRegistry \
@ -156,7 +158,7 @@ LDFLAGSFORBIN+= \
-lSalomeLifeCycleCORBA \
-lTOOLSDS \
-lSalomeGenericObj \
-L${GEOM_ROOT_DIR}/lib/salome \
$(GEOM_LDFLAGS) \
-lGEOMClient \
-lSMESHimpl \
-lSMESHControls \
@ -165,6 +167,7 @@ LDFLAGSFORBIN+= \
$(OCC_LDPATH) \
-lTKCDF \
-lTKBO \
-lTKMath
-lTKMath \
-lTKShHealing
@CONCLUDE@

6
src/SMESH_SWIG/Makefile.in
View File

@ -72,11 +72,9 @@ EXPORT_PYSCRIPTS = libSMESH_Swig.py \
SMESH_mechanic.py \
SMESH_mechanic_tetra.py \
SMESH_mechanic_editor.py \
SMESH_mechanic_netgen.py \
SMESH_fixation.py \
SMESH_fixation_hexa.py \
SMESH_fixation_tetra.py \
SMESH_fixation_netgen.py \
SMESH_box_tetra.py \
SMESH_box2_tetra.py \
SMESH_box3_tetra.py \
@ -115,8 +113,8 @@ LIB_CLIENT_IDL = SALOMEDS.idl \
EXPORT_SHAREDPYSCRIPTS=SMESH_shared_modules.py
CPPFLAGS+=$(QT_INCLUDES) $(PYTHON_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome -DHAVE_CONFIG_H
CPPFLAGS+=$(QT_INCLUDES) $(PYTHON_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) $(KERNEL_CXXFLAGS) -DHAVE_CONFIG_H
LIBS+= $(PYTHON_LIBS)
LDFLAGS+= -lSMESH -L${KERNEL_ROOT_DIR}/lib/salome -lSalomeGenericObj
LDFLAGS+= -lSMESH $(KERNEL_LDFLAGS) -lSalomeGenericObj
@CONCLUDE@

10
src/StdMeshers/Makefile.in
View File

@ -92,19 +92,19 @@ BIN_SRC =
CPPFLAGS+= \
$(OCC_INCLUDES) \
$(BOOST_CPPFLAGS) \
-I${KERNEL_ROOT_DIR}/include/salome
$(KERNEL_CXXFLAGS)
CXXFLAGS+= \
$(OCC_CXXFLAGS) \
-I${KERNEL_ROOT_DIR}/include/salome \
-I${GEOM_ROOT_DIR}/include/salome
$(KERNEL_CXXFLAGS) \
$(GEOM_CXXFLAGS)
LDFLAGS+= \
-lSMESHimpl \
-lMEFISTO2D \
$(OCC_LDPATH) \
-lTKAdvTools \
-L${KERNEL_ROOT_DIR}/lib/salome \
-L${GEOM_ROOT_DIR}/lib/salome
$(KERNEL_LDFLAGS) \
$(GEOM_LDFLAGS)
@CONCLUDE@

8
src/StdMeshersGUI/Makefile.in
View File

@ -62,12 +62,12 @@ LIB_CLIENT_IDL = \
## pb in dependencies search
LIB_CLIENT_IDL += \
SALOME_Comm.idl \
SALOMEDS.idl \
SALOME_GenericObj.idl \
SALOME_ContainerManager.idl \
SALOME_Component.idl \
GEOM_Gen.idl \
SALOME_Comm.idl \
MED.idl
LIB_SERVER_IDL =
@ -75,13 +75,13 @@ LIB_SERVER_IDL =
# additionnal information to compil and link file
CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) \
-I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome -I${GEOM_ROOT_DIR}/include/salome \
$(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) $(GEOM_CXXFLAGS) \
$(BOOST_CPPFLAGS) $(QWT_INCLUDES)
CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome -I${GEOM_ROOT_DIR}/include/salome
CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) $(GEOM_CXXFLAGS)
LDFLAGS += -lSMESH -lVTKViewer -lSalomeApp -lSMESHObject -lSMESHFiltersSelection $(OCC_KERNEL_LIBS) \
-lTKBO -L${KERNEL_ROOT_DIR}/lib/salome -L${GEOM_ROOT_DIR}/lib/salome -L${GUI_ROOT_DIR}/lib/salome \
-lTKBO $(KERNEL_LDFLAGS) $(GEOM_LDFLAGS) $(GUI_LDFLAGS) \
$(QWT_LIBS)
@CONCLUDE@

9
src/StdMeshers_I/Makefile.in
View File

@ -92,13 +92,12 @@ BIN =
BIN_SRC =
# additionnal information to compil and link file
CPPFLAGS+= $(OCC_INCLUDES) $(HDF5_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome \
-I${GEOM_ROOT_DIR}/include/salome $(BOOST_CPPFLAGS)
CXXFLAGS+= $(OCC_CXXFLAGS) $(HDF5_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome -I${GEOM_ROOT_DIR}/include/salome
CPPFLAGS+= $(OCC_INCLUDES) $(HDF5_INCLUDES) $(KERNEL_CXXFLAGS) \
$(GEOM_CXXFLAGS) $(BOOST_CPPFLAGS)
CXXFLAGS+= $(OCC_CXXFLAGS) $(HDF5_INCLUDES) $(KERNEL_CXXFLAGS) $(GEOM_CXXFLAGS)
#IDLCXXFLAGS+= -Wbtp
#LDFLAGS+= $(HDF5_LIBS) -lStdMeshers -lSMESHEngine -lSalomeLifeCycleCORBA -L${KERNEL_ROOT_DIR}/lib/salome -L${GEOM_ROOT_DIR}/lib/salome -lSalomeGenericObj
LDFLAGS+= $(HDF5_LIBS) -lStdMeshers -lSMESHEngine -L${KERNEL_ROOT_DIR}/lib/salome
LDFLAGS+= $(HDF5_LIBS) -lStdMeshers -lSMESHEngine $(KERNEL_LDFLAGS)
@CONCLUDE@