From 57ab5de3e3860d2375538052ac4dd8112c58a111 Mon Sep 17 00:00:00 2001
From: navarrop <navarrop@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Thu, 5 Aug 2010 12:10:21 +0000
Subject: [PATCH 1/1] Give LD_LIBRARY_PATH to smpirun.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8119 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---
 buildtools/Cmake/CompleteInFiles.cmake | 1 +
 examples/smpi/bcast.tesh               | 2 --
 examples/smpi/reduce.tesh              | 2 --
 src/smpi/smpirun.in                    | 3 +++
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/buildtools/Cmake/CompleteInFiles.cmake b/buildtools/Cmake/CompleteInFiles.cmake
index ea3d267221..84fe86f374 100644
--- a/buildtools/Cmake/CompleteInFiles.cmake
+++ b/buildtools/Cmake/CompleteInFiles.cmake
@@ -711,6 +711,7 @@ set(includedir ${prefix}/include)
 set(top_builddir ${PROJECT_DIRECTORY})
 set(libdir ${exec_prefix}/lib)
 set(CMAKE_LINKARGS "${CMAKE_CURRENT_BINARY_DIR}/lib")
+set(CMAKE_SMPI_COMMAND "export LD_LIBRARY_PATH=${CMAKE_CURRENT_BINARY_DIR}/lib:${gtnets_path}/lib:$LD_LIBRARY_PATH")
 
 configure_file(${PROJECT_DIRECTORY}/src/smpi/smpicc.in ${CMAKE_CURRENT_BINARY_DIR}/bin/smpicc @ONLY)
 configure_file(${PROJECT_DIRECTORY}/src/smpi/smpirun.in ${CMAKE_CURRENT_BINARY_DIR}/bin/smpirun @ONLY)
diff --git a/examples/smpi/bcast.tesh b/examples/smpi/bcast.tesh
index d4bab8a5bc..3f3bc3488f 100644
--- a/examples/smpi/bcast.tesh
+++ b/examples/smpi/bcast.tesh
@@ -1,7 +1,5 @@
 # use the tested library, not the installed one
 # (since we want to pass it to the child, it has to be redefined before each command)
-! setenv LD_LIBRARY_PATH=../../lib
-
 # Go for the first test
 p Test Broadcast with less processes than hosts
 $ ../../bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../msg/small_platform.xml -np 3 ./bcast -q
diff --git a/examples/smpi/reduce.tesh b/examples/smpi/reduce.tesh
index e507fa3eee..8b1f1ee3e1 100644
--- a/examples/smpi/reduce.tesh
+++ b/examples/smpi/reduce.tesh
@@ -1,7 +1,5 @@
 # use the tested library, not the installed one
 # (since we want to pass it to the child, it has to be redefined before each command)
-! setenv LD_LIBRARY_PATH=../../lib
-
 # Go for the first test
 p Test Reduce with 3 processes 
 $ ../../bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../msg/small_platform.xml -np 3 ./reduce -q
diff --git a/src/smpi/smpirun.in b/src/smpi/smpirun.in
index 85059a9624..236eab771a 100755
--- a/src/smpi/smpirun.in
+++ b/src/smpi/smpirun.in
@@ -1,4 +1,7 @@
 #!/bin/bash
+
+@CMAKE_SMPI_COMMAND@
+
 DEFAULT_LOOPBACK_BANDWIDTH="498000000"
 DEFAULT_LOOPBACK_LATENCY="0.000004"
 DEFAULT_NETWORK_BANDWIDTH="$((26 * 1024 * 1024))"
-- 
2.20.1