From: Arnaud Giersch <arnaud.giersch@iut-bm.univ-fcomte.fr>
Date: Fri, 29 Jun 2012 07:03:47 +0000 (+0200)
Subject: Don't mix install and build directories in smpicc.
X-Git-Tag: v3_8~417
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/ae63e82d19ff7cf05a322f768bd1159f27c85d79?hp=2759f3e06a1061e6dfdc9c44fa8913cf9e2bd9ad

Don't mix install and build directories in smpicc.

Build directories are already given on command line by cmake.
Ensure that install directories come last in the list so that the correct
directories are used at build time for includes and libraries.
---

diff --git a/src/smpi/smpicc.in b/src/smpi/smpicc.in
index 7a77cbae13..a1d1de1d54 100755
--- a/src/smpi/smpicc.in
+++ b/src/smpi/smpicc.in
@@ -3,8 +3,7 @@
 CC=@CMAKE_C_COMPILER@
 CFLAGS="-O2 -Dmain=smpi_simulated_main"
 
-#FIXME: probably only want the last two pairs after 'make install'
-INCLUDEARGS="-I@top_srcdir@/include -I@top_srcdir@/include/smpi -I@includedir@ -I@includedir@/smpi"
+INCLUDEARGS="-I@includedir@ -I@includedir@/smpi"
 CMAKE_LINKARGS="-L@CMAKE_LINKARGS@"
 LINKARGS="-lsimgrid -lsmpi -lm"
 
@@ -30,7 +29,7 @@ while [ -n "$1" ]; do
   esac
 done
 
-CMDLINE="${CC} ${INCLUDEARGS} ${CFLAGS} ${CMDLINE} ${CMAKE_LINKARGS} ${LINKARGS}"
+CMDLINE="${CC} ${CFLAGS} ${CMDLINE} ${INCLUDEARGS} ${CMAKE_LINKARGS} ${LINKARGS}"
 
 #echo "${CMDLINE}"
 ${CMDLINE}