[yoda-svn] r591 - in trunk: . pyext

[blackhole at projects.hepforge.org]

Author: buckley
Date: Wed Apr 10 10:43:38 2013
New Revision: 591

Log:
Being more careful about adding -Wno-* flags to the C++ compiler used to built the Cython extension lib.

Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/pyext/setup.py.in

Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog	Tue Apr  9 15:59:20 2013	(r590)
+++ trunk/ChangeLog	Wed Apr 10 10:43:38 2013	(r591)
@@ -1,3 +1,8 @@
+2013-04-10  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Being more careful about adding -Wno-* flags to the C++ compiler
+	used to built the Cython extension lib.
+
 2013-03-22  Andy Buckley  <andy.buckley at cern.ch>
 
 	* Removing the use of svn:external to pull in Boost macros and

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	Tue Apr  9 15:59:20 2013	(r590)
+++ trunk/configure.ac	Wed Apr 10 10:43:38 2013	(r591)
@@ -38,9 +38,9 @@
 AC_SUBST([LIB_SUFFIX])
 
 ## Set default build flags
-AC_CEDAR_CHECKCXXFLAG([-pedantic], [AM_CXXFLAGS="$AM_CXXFLAGS -pedantic "])
+AC_CEDAR_CHECKCXXFLAG([-pedantic], [AM_CXXFLAGS="$AM_CXXFLAGS -pedantic"])
 AC_CEDAR_CHECKCXXFLAG([-Wall], [AM_CXXFLAGS="$AM_CXXFLAGS -Wall -Wno-format"])
-AC_CEDAR_CHECKCXXFLAG([-std=c++98], [AM_CXXFLAGS="$AM_CXXFLAGS -std=c++98 "])
+AC_CEDAR_CHECKCXXFLAG([-std=c++98], [AM_CXXFLAGS="$AM_CXXFLAGS -std=c++98"])
 
 ## Debug flag (default=none)
 AC_ARG_ENABLE([debug], [AC_HELP_STRING(--enable-debug, [build with debugging symbols  @<:@default=no@:>@])], [], [enable_debug=no])
@@ -102,6 +102,12 @@
 fi
 AM_CONDITIONAL(ENABLE_PYEXT, [test x$enable_pyext == xyes])
 
+## Set extra Python extension build flags (to cope with Cython output code oddities)
+PYEXT_CXXFLAGS=
+AC_CEDAR_CHECKCXXFLAG([-Wno-unused-but-set-variable], [PYEXT_CXXFLAGS="$PYEXT_CXXFLAGS -Wno-unused-but-set-variable"])
+AC_CEDAR_CHECKCXXFLAG([-Wno-sign-compare], [PYEXT_CXXFLAGS="$PYEXT_CXXFLAGS -Wno-sign-compare"])
+AC_SUBST(PYEXT_CXXFLAGS)
+
 
 ## Optional ROOT analysis framework
 #AC_ARG_ENABLE([ROOT], [AC_HELP_STRING(--enable-root, [build with ROOT output @<:@default=yes@:>@])], [], [enable_root=yes])
@@ -126,7 +132,7 @@
 
 ## Extend and substitute the default build flags after lib testing
 AM_CPPFLAGS="-I\$(top_srcdir)/include -I\$(top_builddir)/include"
-AM_CPPFLAGS="$AM_CPPFLAGS \$(BOOST_CPPFLAGS)"
+AM_CPPFLAGS="$AM_CPPFLAGS $BOOST_CPPFLAGS"
 AC_SUBST(AM_CPPFLAGS)
 AC_SUBST(AM_CXXFLAGS)
 

Modified: trunk/pyext/setup.py.in
==============================================================================
--- trunk/pyext/setup.py.in	Tue Apr  9 15:59:20 2013	(r590)
+++ trunk/pyext/setup.py.in	Wed Apr 10 10:43:38 2013	(r591)
@@ -24,7 +24,7 @@
         language='c++',
         depends=depends,
         include_dirs=[incdir, PKGNAME],
-        extra_compile_args= "-I at prefix@/include @BOOST_CPPFLAGS@ -Wno-unused-but-set-variable -Wno-sign-compare".split(),
+        extra_compile_args= "-I at prefix@/include @BOOST_CPPFLAGS@ @PYEXT_CXXFLAGS@".split(),
         library_dirs=[libdir],
         extra_link_args = ["-L at prefix@/lib"],
         libraries=['stdc++', 'YODA'])