[Rivet-svn] r4315 - in trunk/pyext: . rivet

[blackhole at projects.hepforge.org]

Author: buckley
Date: Tue May 28 19:11:32 2013
New Revision: 4315

Log:
Adding YODA path build flags to Python extension building

Modified:
   trunk/pyext/rivet/rivetwrap.i
   trunk/pyext/setup.py.in

Modified: trunk/pyext/rivet/rivetwrap.i
==============================================================================
--- trunk/pyext/rivet/rivetwrap.i	Tue May 28 18:29:53 2013	(r4314)
+++ trunk/pyext/rivet/rivetwrap.i	Tue May 28 19:11:32 2013	(r4315)
@@ -48,6 +48,8 @@
 }
 //%include "Rivet/Tools/Logging.hh"
 
+//%include "Rivet/Tools/Logging.hh"
+
 // Rivet search paths
 %include "Rivet/Tools/RivetPaths.hh"
 

Modified: trunk/pyext/setup.py.in
==============================================================================
--- trunk/pyext/setup.py.in	Tue May 28 18:29:53 2013	(r4314)
+++ trunk/pyext/setup.py.in	Tue May 28 19:11:32 2013	(r4315)
@@ -18,9 +18,9 @@
 libdir_yaml = '@YAML_CPPLIBPATH@'
 
 ext = Extension('_rivetwrap', [wrapsrc],
-                include_dirs=[incdir_src, incdir_build, '@HEPMCINCPATH@', '@GSLINCPATH@'],
+                include_dirs=[incdir_src, incdir_build, '@HEPMCINCPATH@', '@GSLINCPATH@', '@YODAINCPATH@'],
                 extra_compile_args= "-I at prefix@/include @BOOST_CPPFLAGS@".split(),
-                library_dirs=[libdir, libdir_yaml, '@HEPMCLIBPATH@'],
+                library_dirs=[libdir, libdir_yaml, '@HEPMCLIBPATH@', '@YODALIBPATH@'],
                 extra_link_args = "-L at prefix@/lib @LDFLAGS@".split(),
                 libraries=['Rivet']) # 'HepMC', 'fastjet', 'yaml-cpp', 'GSL', 'HepPID'