[Rivet-svn] r3617 - trunk/pyext

[blackhole at projects.hepforge.org]

Author: buckley
Date: Fri Mar 16 17:48:49 2012
New Revision: 3617

Log:
pyext/setup.py.in: Adding handling for the YAML library: fix for Genser build from Anton Karneyeu.

Modified:
   trunk/pyext/setup.py.in

Modified: trunk/pyext/setup.py.in
==============================================================================
--- trunk/pyext/setup.py.in	Fri Mar 16 15:41:03 2012	(r3616)
+++ trunk/pyext/setup.py.in	Fri Mar 16 17:48:49 2012	(r3617)
@@ -14,11 +14,14 @@
 incdir_src = os.path.abspath('@top_srcdir@/include')
 incdir_build = os.path.abspath('@top_builddir@/include')
 libdir = os.path.abspath('@top_builddir@/src/.libs')
+libdir_yaml = '@YAML_CPPLIBPATH@'
+if not libdir_yaml:
+    libdir_yaml = '@top_builddir@/src/Tools/yaml-cpp/.libs'
 cxxargs = '@CXXFLAGS@'.split()
 ldargs = '@LDFLAGS@'.split()
 ext = Extension('_rivetwrap',
                 [wrapsrc],
-                define_macros = [("SWIG_TYPE_TABLE", "hepmccompat")],
+                define_macros = [('SWIG_TYPE_TABLE', 'hepmccompat')],
                 include_dirs=[incdir_src, incdir_build, '@HEPMCINCPATH@', '@BOOSTINCPATH@', '@GSLINCPATH@'],
                 library_dirs=[libdir, '@HEPMCLIBPATH@'],
                 extra_compile_args = cxxargs,