From: Martin Quinson <martin.quinson@loria.fr>
Date: Sun, 3 Dec 2017 08:49:30 +0000 (+0100)
Subject: fix out of dir builds
X-Git-Tag: v3.18~178
X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/26aa7a809ed123b511f529fc9d0ac2c3c3b9f71d

fix out of dir builds
---

diff --git a/examples/s4u/CMakeLists.txt b/examples/s4u/CMakeLists.txt
index 1a15301d46..f91d36412d 100644
--- a/examples/s4u/CMakeLists.txt
+++ b/examples/s4u/CMakeLists.txt
@@ -77,6 +77,6 @@ foreach(example actions-comm actions-storage
   ADD_TESH_FACTORIES(s4u-${example} "thread;ucontext;raw;boost" 
                                     --setenv bindir=${CMAKE_CURRENT_BINARY_DIR}/${example} 
 				    --setenv platfdir=${CMAKE_HOME_DIRECTORY}/examples/platforms 
-				    --cd ${CMAKE_CURRENT_BINARY_DIR}/${example} 
+				    --cd ${CMAKE_CURRENT_SOURCE_DIR}/${example} 
 				    ${CMAKE_HOME_DIRECTORY}/examples/s4u/${example}/s4u-${example}.tesh)
 endforeach()
diff --git a/examples/s4u/io/s4u-io.cpp b/examples/s4u/io/s4u-io.cpp
index dc3e5e3cad..ac0ff0f708 100644
--- a/examples/s4u/io/s4u-io.cpp
+++ b/examples/s4u/io/s4u-io.cpp
@@ -84,7 +84,10 @@ int main(int argc, char **argv)
 {
   simgrid::s4u::Engine e(&argc, argv);
   sg_storage_file_system_init();
-  e.loadPlatform("../../platforms/storage/storage.xml");
+  const char* platffile = "../../platforms/storage/storage.xml";
+  if (argc > 1)
+    platffile = argv[1];
+  e.loadPlatform(platffile);
   simgrid::s4u::Actor::createActor("host", simgrid::s4u::Host::by_name("denise"), MyHost());
   e.run();
 
diff --git a/examples/s4u/io/s4u-io.tesh b/examples/s4u/io/s4u-io.tesh
index 29188d7ab5..f00cee29e3 100644
--- a/examples/s4u/io/s4u-io.tesh
+++ b/examples/s4u/io/s4u-io.tesh
@@ -1,6 +1,6 @@
 #! ./tesh
 
-$ $SG_TEST_EXENV ${bindir:=.}/s4u-io
+$ $SG_TEST_EXENV ${bindir:=.}/s4u-io ${platfdir}/storage/storage.xml
 > [denise:host:(1) 0.000000] [s4u_test/INFO] Storage info on denise:
 > [denise:host:(1) 0.000000] [s4u_test/INFO]     Disk2 (c:) Used: 2391537133; Free: 534479374867; Total: 536870912000.
 > [denise:host:(1) 0.000000] [s4u_test/INFO]     Disk4 (/home) Used: 13221994; Free: 536857690006; Total: 536870912000.