[Rivet-svn] r3853 - in branches/2012-06-aidarivet: . bin

[blackhole at projects.hepforge.org]

Author: buckley
Date: Tue Jul 24 11:49:51 2012
New Revision: 3853

Log:
Improving rivet-buildplugin to specify library search paths

Modified:
   branches/2012-06-aidarivet/ChangeLog
   branches/2012-06-aidarivet/bin/rivet-buildplugin.in

Modified: branches/2012-06-aidarivet/ChangeLog
==============================================================================
--- branches/2012-06-aidarivet/ChangeLog	Tue Jul 24 11:49:02 2012	(r3852)
+++ branches/2012-06-aidarivet/ChangeLog	Tue Jul 24 11:49:51 2012	(r3853)
@@ -1,6 +1,6 @@
 2012-07-24  Andy Buckley  <andy.buckley at cern.ch>
 
-	* Improvements to rivet-mkhtml.
+	* Improvements to rivet-mkhtml and rivet-buildplugin.
 
 2012-07-17  Hendrik Hoeth <hendrik.hoeth at cern.ch>
 

Modified: branches/2012-06-aidarivet/bin/rivet-buildplugin.in
==============================================================================
--- branches/2012-06-aidarivet/bin/rivet-buildplugin.in	Tue Jul 24 11:49:02 2012	(r3852)
+++ branches/2012-06-aidarivet/bin/rivet-buildplugin.in	Tue Jul 24 11:49:51 2012	(r3853)
@@ -72,6 +72,15 @@
 iboost="@BOOSTINCPATH@"
 test -n "$iboost" && mycppflags="$mycppflags -I${iboost}"
 
+## Get Rivet system linker flags (duplicating that in rivet-config.in)
+myldflags=""
+lrivet="@libdir@"
+test -n "$lrivet" && myldflags="$mycppflags -L${lrivet}"
+lhepmc="@HEPMCLIBPATH@"
+test -n "$lhepmc" && myldflags="$mycppflags -L${lhepmc}"
+lfastjet="@FASTJETLIBPATH@"
+test -n "$lfastjet" && myldflags="$mycppflags -L${lfastjet}"
+
 ## Link against ROOT if requested
 with_root=$(echo $* | egrep -- '--\<with-root\>')
 # echo $with_root
@@ -105,6 +114,6 @@
 fi
 
 ## Build
-cmd="$mycxx -o \"$libname\" $shared_flags $mycppflags $mycxxflags $sources_and_flags"
+cmd="$mycxx -o \"$libname\" $shared_flags $mycppflags $mycxxflags $myldflags $sources_and_flags"
 echo $cmd
 eval $cmd