Issue 0020194: EDF 977 ALL: Get rid of warnings PACKAGE_VERSION already defined
This commit is contained in:
vsr
parent
fd6f6eae03
commit
a2e972884c
@ -127,8 +127,8 @@ namespace nglib {
|
||||
rm -rf linopt.o bfgs.o linsearch.o global.o bisect.o meshtool.o refine.o ruler3.o improve3.o adfront3.o tetrarls.o prism2rls.o profiler.o pyramidrls.o pyramid2rls.o netrule3.o ruler2.o meshclass.o improve2.o adfront2.o netrule2.o triarls.o geomsearch.o secondorder.o meshtype.o parser3.o quadrls.o specials.o parser2.o meshing2.o meshing3.o meshfunc.o localh.o improve2gen.o delaunay.o boundarylayer.o msghandler.o meshfunc2d.o smoothing2.o smoothing3.o topology.o curvedelems_new.o clusters.o zrefine.o ngexception.o geomtest3d.o geom2d.o geom2dmesh.o geom3d.o adtree.o transform3d.o geomfuncs.o polynomial.o densemat.o vector.o basemat.o sparsmat.o algprim.o brick.o manifold.o bspline2d.o meshsurf.o csgeom.o polyhedra.o curve2d.o singularref.o edgeflw.o solid.o explicitcurve2d.o specpoin.o gencyl.o revolution.o genmesh.o genmesh2d.o spline3d.o surface.o identify.o triapprox.o meshstlsurface.o stlline.o stltopology.o stltool.o stlgeom.o stlgeomchart.o stlgeommesh.o table.o optmem.o spbita2d.o hashtabl.o sort.o flags.o seti.o bitarray.o array.o symbolta.o mystring.o moveablemem.o spline.o splinegeometry.o ngnewdelete.o nglib.o hprefinement.o Partition_Inter2d.o Partition_Loop.o Partition_Loop3d.o Partition_Inter3d.o Partition_Loop2d.o Partition_Spliter.o occgeom.o occgenmesh.o occmeshsurf.o csgparser.o dynamicmem.o extrusion.o occconstruction.o parthreads.o readuser.o writeabaqus.o writediffpack.o writeelmer.o writefeap.o writefluent.o writegmsh.o writejcm.o writepermas.o writetecplot.o writetochnog.o writeuser.o wuchemnitz.o,
|
||||
Netgen_ok=no)
|
||||
|
||||
AC_CACHE_VAL(salome_netgen_lib,[
|
||||
AC_TRY_LINK(
|
||||
AC_CACHE_VAL(salome_cv_netgen_lib,[
|
||||
AC_TRY_LINK([
|
||||
#include <iostream>
|
||||
#include <fstream>
|
||||
namespace nglib {
|
||||
@ -136,12 +136,15 @@ namespace nglib {
|
||||
}
|
||||
#define OCCGEOMETRY
|
||||
#include <occgeom.hpp>
|
||||
,nglib::Ng_Init();
|
||||
],[
|
||||
nglib::Ng_Init();
|
||||
netgen::OCCGeometry occgeo;
|
||||
nglib::Ng_Exit();,
|
||||
eval "salome_netgen_lib=yes";rm -rf libNETGEN.so,eval "salome_netgen_lib=no";rm -rf libNETGEN.so)
|
||||
nglib::Ng_Exit();
|
||||
],
|
||||
[eval "salome_cv_netgen_lib=yes";rm -rf libNETGEN.so],
|
||||
[eval "salome_cv_netgen_lib=no";rm -rf libNETGEN.so])
|
||||
])
|
||||
Netgen_ok="$salome_netgen_lib"
|
||||
Netgen_ok="$salome_cv_netgen_lib"
|
||||
|
||||
|
||||
LDFLAGS="$LDFLAGS_old"
|
||||
|
||||
@ -19,6 +19,14 @@
|
||||
#
|
||||
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
|
||||
#
|
||||
|
||||
# ============================================================
|
||||
# The following is to avoid PACKAGE_... env variable
|
||||
# redefinition compilation warnings
|
||||
# ============================================================
|
||||
AM_CXXFLAGS = @KERNEL_CXXFLAGS@ -include SALOMEconfig.h
|
||||
AM_CPPFLAGS = @KERNEL_CXXFLAGS@ -include SALOMEconfig.h
|
||||
|
||||
# ============================================================
|
||||
# This file defines the common definitions used in several
|
||||
# Makefile. This file must be included, if needed, by the file
|
||||
|
||||
@ -74,34 +74,15 @@ cd ${CONF_DIR}
|
||||
ABS_CONF_DIR=`pwd`
|
||||
|
||||
#######################################################################
|
||||
mkdir -p salome_adm/unix/config_files
|
||||
#cp -f ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files/* salome_adm/unix/config_files
|
||||
#cp -f ${KERNEL_ROOT_DIR}/salome_adm/unix/pythonbe.py salome_adm/unix
|
||||
|
||||
cp -f ${KERNEL_ROOT_DIR}/salome_adm/unix/SALOMEconfig.h.in salome_adm/unix
|
||||
|
||||
#cp -f ${GUI_ROOT_DIR}/adm_local/unix/config_files/* salome_adm/unix/config_files
|
||||
#cp -f ${MED_ROOT_DIR}/adm_local/unix/config_files/* salome_adm/unix/config_files
|
||||
#cp -f ${GEOM_ROOT_DIR}/adm_local/unix/config_files/* salome_adm/unix/config_files
|
||||
#cp -f ${SMESH_ROOT_DIR}/adm_local/unix/config_files/* salome_adm/unix/config_files
|
||||
|
||||
# remove KERNEL deprecated configure files
|
||||
#for deprecated in ac_cc_warnings.m4 ac_cxx_partial_specialization.m4 \
|
||||
# check_mico.m4 config.guess ltmain.sh ac_cxx_bool.m4 ltconfig ac_cxx_typename.m4 \
|
||||
# check_pthreads.m4 config.sub libtool.m4 ac_cxx_mutable.m4 missing
|
||||
# do
|
||||
# rm -f salome_adm/unix/config_files/${deprecated}
|
||||
# done
|
||||
|
||||
|
||||
# ____________________________________________________________________
|
||||
# aclocal creates the aclocal.m4 file from the standard macro and the
|
||||
# custom macro embedded in the directory salome_adm/unix/config_files
|
||||
# custom macro embedded in the directory adm_local/unix/config_files
|
||||
# and KERNEL config_files directory.
|
||||
# output:
|
||||
# aclocal.m4
|
||||
# autom4te.cache (directory)
|
||||
echo "====================================================== aclocal"
|
||||
echo "======================================================= aclocal"
|
||||
|
||||
aclocal -I adm_local/unix/config_files \
|
||||
-I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \
|
||||
@ -115,10 +96,10 @@ aclocal -I adm_local/unix/config_files \
|
||||
# version. The files are created in the directory specified with the
|
||||
# AC_CONFIG_AUX_DIR(<mydir>) tag (see configure.ac).
|
||||
# output:
|
||||
# salome_adm/unix/config_files/config.guess
|
||||
# salome_adm/unix/config_files/config.sub
|
||||
# salome_adm/unix/config_files/ltmain.sh
|
||||
#echo "====================================================== libtoolize"
|
||||
# adm_local/unix/config_files/config.guess
|
||||
# adm_local/unix/config_files/config.sub
|
||||
# adm_local/unix/config_files/ltmain.sh
|
||||
echo "==================================================== libtoolize"
|
||||
|
||||
libtoolize --force --copy --automake || exit 1
|
||||
|
||||
@ -138,11 +119,11 @@ autoconf
|
||||
# AC_CONFIG_AUX_DIR(<mydir>) tag (see configure.ac). This step also
|
||||
# creates the Makefile.in files from the Makefile.am files.
|
||||
# output:
|
||||
# salome_adm/unix/config_files/compile
|
||||
# salome_adm/unix/config_files/depcomp
|
||||
# salome_adm/unix/config_files/install-sh
|
||||
# salome_adm/unix/config_files/missing
|
||||
# salome_adm/unix/config_files/py-compile
|
||||
# adm_local/unix/config_files/compile
|
||||
# adm_local/unix/config_files/depcomp
|
||||
# adm_local/unix/config_files/install-sh
|
||||
# adm_local/unix/config_files/missing
|
||||
# adm_local/unix/config_files/py-compile
|
||||
# Makefile.in (from Makefile.am)
|
||||
echo "====================================================== automake"
|
||||
|
||||
|
||||
@ -32,7 +32,7 @@
|
||||
# Created from configure.in.base
|
||||
#
|
||||
AC_INIT([Salome2 Project NETGENPLUGIN module], [5.1.2], [webmaster.salome@opencascade.com], [SalomeNETGENPLUGIN])
|
||||
AC_CONFIG_AUX_DIR(salome_adm/unix/config_files)
|
||||
AC_CONFIG_AUX_DIR(adm_local/unix/config_files)
|
||||
AC_CANONICAL_HOST
|
||||
AC_CANONICAL_TARGET
|
||||
AM_INIT_AUTOMAKE([-Wno-portability])
|
||||
@ -101,7 +101,7 @@ dnl Fix up the INSTALL macro if it s a relative path. We want the
|
||||
dnl full-path to the binary instead.
|
||||
case "$INSTALL" in
|
||||
*install-sh*)
|
||||
INSTALL='\${KERNEL_ROOT_DIR}'/salome_adm/unix/config_files/install-sh
|
||||
INSTALL='\${KERNEL_ROOT_DIR}'/adm_local/unix/config_files/install-sh
|
||||
;;
|
||||
esac
|
||||
|
||||
@ -410,7 +410,6 @@ echo
|
||||
# autoscan, the Makefile list is generated in the output file configure.scan.
|
||||
# This could be helpfull to update de configuration.
|
||||
AC_OUTPUT([ \
|
||||
salome_adm/unix/SALOMEconfig.h \
|
||||
adm_local/Makefile \
|
||||
adm_local/unix/Makefile \
|
||||
adm_local/unix/config_files/Makefile \
|
||||
|
||||
@ -46,7 +46,6 @@ libSalomeIDLNETGENPLUGIN_la_CPPFLAGS = \
|
||||
$(SMESH_CXXFLAGS) \
|
||||
@CORBA_CXXFLAGS@ \
|
||||
@CORBA_INCLUDES@ \
|
||||
-I$(top_builddir)/salome_adm/unix \
|
||||
-I$(top_builddir)/idl
|
||||
|
||||
libSalomeIDLNETGENPLUGIN_la_LDFLAGS = -no-undefined -version-info=0:0:0
|
||||
@ -71,8 +70,7 @@ IDLCXXFLAGS = \
|
||||
-I$(top_builddir)/idl/salome \
|
||||
-I$(KERNEL_ROOT_DIR)/idl/salome \
|
||||
-I$(GEOM_ROOT_DIR)/idl/salome \
|
||||
-I$(SMESH_ROOT_DIR)/idl/salome \
|
||||
-I$(top_builddir)/salome_adm/unix
|
||||
-I$(SMESH_ROOT_DIR)/idl/salome
|
||||
IDLPYFLAGS = \
|
||||
@IDLPYFLAGS@ \
|
||||
-I$(KERNEL_ROOT_DIR)/idl/salome \
|
||||
@ -108,7 +106,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$(GEOM_ROOT_DIR)/idl/salome -I$(SMESH_ROOT_DIR)/idl/salome -I$(top_builddir)/salome_adm/unix $$dep 2>/dev/null | \
|
||||
$(CPP) $(C_DEPEND_FLAG) -x c -I$(srcdir) -I$(KERNEL_ROOT_DIR)/idl/salome -I$(GEOM_ROOT_DIR)/idl/salome -I$(SMESH_ROOT_DIR)/idl/salome $$dep 2>/dev/null | \
|
||||
sed 's/\.o/\SK.cc/' >>$@; \
|
||||
fi; \
|
||||
done ;
|
||||
|
||||
@ -63,8 +63,7 @@ libNETGENPluginGUI_la_CPPFLAGS = \
|
||||
$(CORBA_CXXFLAGS) \
|
||||
$(CORBA_INCLUDES) \
|
||||
-I$(srcdir)/../NETGENPlugin \
|
||||
-I$(top_builddir)/idl \
|
||||
-I$(top_builddir)/salome_adm/unix
|
||||
-I$(top_builddir)/idl
|
||||
|
||||
libNETGENPluginGUI_la_LDFLAGS = \
|
||||
../NETGENPlugin/libNETGENEngine.la \
|
||||
|
||||
@ -82,8 +82,7 @@ libNETGENEngine_la_CPPFLAGS = \
|
||||
$(CORBA_CXXFLAGS) \
|
||||
$(CORBA_INCLUDES) \
|
||||
$(BOOST_CPPFLAGS) \
|
||||
-I$(top_builddir)/idl \
|
||||
-I$(top_builddir)/salome_adm/unix
|
||||
-I$(top_builddir)/idl
|
||||
|
||||
libNETGENEngine_la_LDFLAGS = \
|
||||
../NETGEN/libNETGEN.la \
|
||||
|
||||
Loading…
Reference in New Issue
Block a user