First commit for do cmake in an other directory.

Conflicts:

	include/surf/simgrid_dtd.h

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7574 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/examples/amok/bandwidth/CMakeLists.txt b/examples/amok/bandwidth/CMakeLists.txt
index 78b8485..f99521c 100644 (file)
--- a/examples/amok/bandwidth/CMakeLists.txt
+++ b/examples/amok/bandwidth/CMakeLists.txt
@@ -1,14 +1,14 @@
 cmake_minimum_required(VERSION 2.6)
 
-set_source_files_properties(_bandwidth_simulator.c _bandwidth_maestro.c _bandwidth_sensor.c
+set_source_files_properties(${PROJECT_DIRECTORY}/examples/amok/bandwidth/_bandwidth_simulator.c ${PROJECT_DIRECTORY}/examples/amok/bandwidth/_bandwidth_maestro.c ${PROJECT_DIRECTORY}/examples/amok/bandwidth/_bandwidth_sensor.c
 PROPERTIES GENERATED true)
 
 set(EXECUTABLE_OUTPUT_PATH "./")
 set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib")
 
-add_executable(bandwidth_simulator _bandwidth_simulator.c bandwidth.c)
-add_executable(bandwidth_maestro _bandwidth_maestro.c bandwidth.c)
-add_executable(bandwidth_sensor _bandwidth_sensor.c bandwidth.c)
+add_executable(bandwidth_simulator ${PROJECT_DIRECTORY}/examples/amok/bandwidth/_bandwidth_simulator.c ${PROJECT_DIRECTORY}/examples/amok/bandwidth/bandwidth.c)
+add_executable(bandwidth_maestro ${PROJECT_DIRECTORY}/examples/amok/bandwidth/_bandwidth_maestro.c ${PROJECT_DIRECTORY}/examples/amok/bandwidth/bandwidth.c)
+add_executable(bandwidth_sensor ${PROJECT_DIRECTORY}/examples/amok/bandwidth/_bandwidth_sensor.c ${PROJECT_DIRECTORY}/examples/amok/bandwidth/bandwidth.c)
 
 ### Add definitions for compile
 target_link_libraries(bandwidth_simulator simgrid pthread m -fprofile-arcs)

diff --git a/examples/amok/saturate/CMakeLists.txt b/examples/amok/saturate/CMakeLists.txt
index 9038f98..f230081 100644 (file)
--- a/examples/amok/saturate/CMakeLists.txt
+++ b/examples/amok/saturate/CMakeLists.txt
@@ -1,14 +1,14 @@
 cmake_minimum_required(VERSION 2.6)
 
-set_source_files_properties(_saturate_simulator.c _saturate_maestro.c _saturate_sensor.c
+set_source_files_properties(${PROJECT_DIRECTORY}/examples/amok/saturate/_saturate_simulator.c ${PROJECT_DIRECTORY}/examples/amok/saturate/_saturate_maestro.c ${PROJECT_DIRECTORY}/examples/amok/saturate/_saturate_sensor.c
 PROPERTIES GENERATED true)
 
 set(EXECUTABLE_OUTPUT_PATH "./")
 set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib")
 
-add_executable(saturate_simulator _saturate_simulator.c saturate.c)
-add_executable(saturate_maestro _saturate_maestro.c saturate.c)
-add_executable(saturate_sensor _saturate_sensor.c saturate.c)
+add_executable(saturate_simulator ${PROJECT_DIRECTORY}/examples/amok/saturate/_saturate_simulator.c ${PROJECT_DIRECTORY}/examples/amok/saturate/saturate.c)
+add_executable(saturate_maestro ${PROJECT_DIRECTORY}/examples/amok/saturate/_saturate_maestro.c ${PROJECT_DIRECTORY}/examples/amok/saturate/saturate.c)
+add_executable(saturate_sensor ${PROJECT_DIRECTORY}/examples/amok/saturate/_saturate_sensor.c ${PROJECT_DIRECTORY}/examples/amok/saturate/saturate.c)
 
 ### Add definitions for compile
 target_link_libraries(saturate_simulator simgrid pthread m -fprofile-arcs)

diff --git a/examples/gras/all2all/CMakeLists.txt b/examples/gras/all2all/CMakeLists.txt
index da39056..ab381cc 100644 (file)
--- a/examples/gras/all2all/CMakeLists.txt
+++ b/examples/gras/all2all/CMakeLists.txt
@@ -1,14 +1,14 @@
 cmake_minimum_required(VERSION 2.6)
 
-set_source_files_properties(_all2all_simulator.c _all2all_sender.c _all2all_receiver.c
+set_source_files_properties(${PROJECT_DIRECTORY}/examples/gras/all2all/_all2all_simulator.c ${PROJECT_DIRECTORY}/examples/gras/all2all/_all2all_sender.c ${PROJECT_DIRECTORY}/examples/gras/all2all/_all2all_receiver.c
 PROPERTIES GENERATED true)
 
 set(EXECUTABLE_OUTPUT_PATH "./")
 set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib")
 
-add_executable(all2all_simulator _all2all_simulator.c all2all.c)
-add_executable(all2all_sender _all2all_sender.c all2all.c)
-add_executable(all2all_receiver _all2all_receiver.c all2all.c)
+add_executable(all2all_simulator ${PROJECT_DIRECTORY}/examples/gras/all2all/_all2all_simulator.c ${PROJECT_DIRECTORY}/examples/gras/all2all/all2all.c)
+add_executable(all2all_sender ${PROJECT_DIRECTORY}/examples/gras/all2all/_all2all_sender.c ${PROJECT_DIRECTORY}/examples/gras/all2all/all2all.c)
+add_executable(all2all_receiver ${PROJECT_DIRECTORY}/examples/gras/all2all/_all2all_receiver.c ${PROJECT_DIRECTORY}/examples/gras/all2all/all2all.c)
 
 ### Add definitions for compile
 target_link_libraries(all2all_simulator simgrid pthread m -fprofile-arcs)

diff --git a/examples/gras/chrono/CMakeLists.txt b/examples/gras/chrono/CMakeLists.txt
index 692fd83..faea4e8 100644 (file)
--- a/examples/gras/chrono/CMakeLists.txt
+++ b/examples/gras/chrono/CMakeLists.txt
@@ -1,13 +1,13 @@
 cmake_minimum_required(VERSION 2.6)
 
-set_source_files_properties(_chrono_simulator.c _chrono_multiplier.c
+set_source_files_properties(${PROJECT_DIRECTORY}/examples/gras/chrono/_chrono_simulator.c ${PROJECT_DIRECTORY}/examples/gras/chrono/_chrono_multiplier.c
 PROPERTIES GENERATED true)
 
 set(EXECUTABLE_OUTPUT_PATH "./")
 set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib")
 
-add_executable(chrono_simulator _chrono_simulator.c chrono.c)
-add_executable(chrono_multiplier _chrono_multiplier.c chrono.c)
+add_executable(chrono_simulator ${PROJECT_DIRECTORY}/examples/gras/chrono/_chrono_simulator.c ${PROJECT_DIRECTORY}/examples/gras/chrono/chrono.c)
+add_executable(chrono_multiplier ${PROJECT_DIRECTORY}/examples/gras/chrono/_chrono_multiplier.c ${PROJECT_DIRECTORY}/examples/gras/chrono/chrono.c)
 
 ### Add definitions for compile
 target_link_libraries(chrono_simulator simgrid pthread m -fprofile-arcs)

diff --git a/examples/gras/mmrpc/CMakeLists.txt b/examples/gras/mmrpc/CMakeLists.txt
index 272ee1e..87e8a97 100644 (file)
--- a/examples/gras/mmrpc/CMakeLists.txt
+++ b/examples/gras/mmrpc/CMakeLists.txt
@@ -1,14 +1,14 @@
 cmake_minimum_required(VERSION 2.6)
 
-set_source_files_properties(_mmrpc_simulator.c _mmrpc_client.c _mmrpc_server.c
+set_source_files_properties(${PROJECT_DIRECTORY}/examples/gras/mmrpc/_mmrpc_simulator.c ${PROJECT_DIRECTORY}/examples/gras/mmrpc/_mmrpc_client.c ${PROJECT_DIRECTORY}/examples/gras/mmrpc/_mmrpc_server.c
 PROPERTIES GENERATED true)
 
 set(EXECUTABLE_OUTPUT_PATH "./")
 set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib")
 
-add_executable(mmrpc_simulator _mmrpc_simulator.c mmrpc_common.c mmrpc_client.c mmrpc_server.c)
-add_executable(mmrpc_client _mmrpc_client.c    mmrpc_common.c mmrpc_client.c)
-add_executable(mmrpc_server _mmrpc_server.c    mmrpc_common.c mmrpc_server.c)
+add_executable(mmrpc_simulator ${PROJECT_DIRECTORY}/examples/gras/mmrpc/_mmrpc_simulator.c ${PROJECT_DIRECTORY}/examples/gras/mmrpc/mmrpc_common.c ${PROJECT_DIRECTORY}/examples/gras/mmrpc/mmrpc_client.c ${PROJECT_DIRECTORY}/examples/gras/mmrpc/mmrpc_server.c)
+add_executable(mmrpc_client ${PROJECT_DIRECTORY}/examples/gras/mmrpc/_mmrpc_client.c    ${PROJECT_DIRECTORY}/examples/gras/mmrpc/mmrpc_common.c ${PROJECT_DIRECTORY}/examples/gras/mmrpc/mmrpc_client.c)
+add_executable(mmrpc_server ${PROJECT_DIRECTORY}/examples/gras/mmrpc/_mmrpc_server.c    ${PROJECT_DIRECTORY}/examples/gras/mmrpc/mmrpc_common.c ${PROJECT_DIRECTORY}/examples/gras/mmrpc/mmrpc_server.c)
 
 ### Add definitions for compile
 target_link_libraries(mmrpc_simulator simgrid pthread m -fprofile-arcs)

diff --git a/examples/gras/mutual_exclusion/simple_token/CMakeLists.txt b/examples/gras/mutual_exclusion/simple_token/CMakeLists.txt
index b78e403..8979bd2 100644 (file)
--- a/examples/gras/mutual_exclusion/simple_token/CMakeLists.txt
+++ b/examples/gras/mutual_exclusion/simple_token/CMakeLists.txt
@@ -1,13 +1,13 @@
 cmake_minimum_required(VERSION 2.6)
 
-set_source_files_properties(_simple_token_simulator.c _simple_token_node.c
+set_source_files_properties(${PROJECT_DIRECTORY}/examples/gras/mutual_exclusion/simple_token/_simple_token_simulator.c ${PROJECT_DIRECTORY}/examples/gras/mutual_exclusion/simple_token/_simple_token_node.c
 PROPERTIES GENERATED true)
 
 set(EXECUTABLE_OUTPUT_PATH "./")
 set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib")
 
-add_executable(simple_token_simulator _simple_token_simulator.c simple_token.c)
-add_executable(simple_token_node _simple_token_node.c simple_token.c)
+add_executable(simple_token_simulator ${PROJECT_DIRECTORY}/examples/gras/mutual_exclusion/simple_token/_simple_token_simulator.c ${PROJECT_DIRECTORY}/examples/gras/mutual_exclusion/simple_token/simple_token.c)
+add_executable(simple_token_node ${PROJECT_DIRECTORY}/examples/gras/mutual_exclusion/simple_token/_simple_token_node.c ${PROJECT_DIRECTORY}/examples/gras/mutual_exclusion/simple_token/simple_token.c)
 
 ### Add definitions for compile
 target_link_libraries(simple_token_simulator simgrid pthread m -fprofile-arcs)

diff --git a/examples/gras/ping/CMakeLists.txt b/examples/gras/ping/CMakeLists.txt
index 2718131..f100b25 100644 (file)
--- a/examples/gras/ping/CMakeLists.txt
+++ b/examples/gras/ping/CMakeLists.txt
@@ -1,14 +1,14 @@
 cmake_minimum_required(VERSION 2.6)
 
-set_source_files_properties(_ping_simulator.c _ping_client.c _ping_server.c
+set_source_files_properties(${PROJECT_DIRECTORY}/examples/gras/ping/_ping_simulator.c ${PROJECT_DIRECTORY}/examples/gras/ping/_ping_client.c ${PROJECT_DIRECTORY}/examples/gras/ping/_ping_server.c
 PROPERTIES GENERATED true)
 
 set(EXECUTABLE_OUTPUT_PATH "./")
 set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib")
 
-add_executable(ping_simulator _ping_simulator.c ping_server.c ping_client.c ping_common.c)
-add_executable(ping_client _ping_client.c ping_client.c ping_common.c)
-add_executable(ping_server _ping_server.c ping_server.c ping_common.c)
+add_executable(ping_simulator ${PROJECT_DIRECTORY}/examples/gras/ping/_ping_simulator.c ping_server.c ${PROJECT_DIRECTORY}/examples/gras/ping/ping_client.c ${PROJECT_DIRECTORY}/examples/gras/ping/ping_common.c)
+add_executable(ping_client ${PROJECT_DIRECTORY}/examples/gras/ping/_ping_client.c ${PROJECT_DIRECTORY}/examples/gras/ping/ping_client.c ping_common.c)
+add_executable(ping_server ${PROJECT_DIRECTORY}/examples/gras/ping/_ping_server.c ${PROJECT_DIRECTORY}/examples/gras/ping/ping_server.c ping_common.c)
 
 ### Add definitions for compile
 target_link_libraries(ping_simulator simgrid pthread m -fprofile-arcs)

diff --git a/examples/gras/pmm/CMakeLists.txt b/examples/gras/pmm/CMakeLists.txt
index 6b791d2..1398b2a 100644 (file)
--- a/examples/gras/pmm/CMakeLists.txt
+++ b/examples/gras/pmm/CMakeLists.txt
@@ -1,14 +1,14 @@
 cmake_minimum_required(VERSION 2.6)
 
-set_source_files_properties(_pmm_simulator.c _pmm_slave.c _pmm_master.c
+set_source_files_properties(${PROJECT_DIRECTORY}/examples/gras/pmm/_pmm_simulator.c ${PROJECT_DIRECTORY}/examples/gras/pmm/_pmm_slave.c ${PROJECT_DIRECTORY}/examples/gras/pmm/_pmm_master.c
 PROPERTIES GENERATED true)
 
 set(EXECUTABLE_OUTPUT_PATH "./")
 set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib")
 
-add_executable(pmm_simulator _pmm_simulator.c pmm.c)
-add_executable(pmm_slave _pmm_slave.c pmm.c)
-add_executable(pmm_master _pmm_master.c pmm.c)
+add_executable(pmm_simulator ${PROJECT_DIRECTORY}/examples/gras/pmm/_pmm_simulator.c ${PROJECT_DIRECTORY}/examples/gras/pmm/pmm.c)
+add_executable(pmm_slave ${PROJECT_DIRECTORY}/examples/gras/pmm/_pmm_slave.c ${PROJECT_DIRECTORY}/examples/gras/pmm/pmm.c)
+add_executable(pmm_master ${PROJECT_DIRECTORY}/examples/gras/pmm/_pmm_master.c ${PROJECT_DIRECTORY}/examples/gras/pmm/pmm.c)
 
 ### Add definitions for compile
 target_link_libraries(pmm_simulator simgrid pthread m -fprofile-arcs)

diff --git a/examples/gras/properties/CMakeLists.txt b/examples/gras/properties/CMakeLists.txt
index ca58773..020d138 100644 (file)
--- a/examples/gras/properties/CMakeLists.txt
+++ b/examples/gras/properties/CMakeLists.txt
@@ -1,14 +1,14 @@
 cmake_minimum_required(VERSION 2.6)
 
-set_source_files_properties(_properties_simulator.c _properties_alice.c _properties_bob.c
+set_source_files_properties(${PROJECT_DIRECTORY}/examples/gras/properties/_properties_simulator.c ${PROJECT_DIRECTORY}/examples/gras/properties/_properties_alice.c ${PROJECT_DIRECTORY}/examples/gras/properties/_properties_bob.c
 PROPERTIES GENERATED true)
 
 set(EXECUTABLE_OUTPUT_PATH "./")
 set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib")
 
-add_executable(properties_simulator _properties_simulator.c properties.c)
-add_executable(properties_alice _properties_alice.c    properties.c)
-add_executable(properties_bob _properties_bob.c    properties.c)
+add_executable(properties_simulator ${PROJECT_DIRECTORY}/examples/gras/properties/_properties_simulator.c ${PROJECT_DIRECTORY}/examples/gras/properties/properties.c)
+add_executable(properties_alice ${PROJECT_DIRECTORY}/examples/gras/properties/_properties_alice.c    ${PROJECT_DIRECTORY}/examples/gras/properties/properties.c)
+add_executable(properties_bob ${PROJECT_DIRECTORY}/examples/gras/properties/_properties_bob.c    ${PROJECT_DIRECTORY}/examples/gras/properties/properties.c)
 
 ### Add definitions for compile
 target_link_libraries(properties_simulator simgrid pthread m -fprofile-arcs)

diff --git a/examples/gras/rpc/CMakeLists.txt b/examples/gras/rpc/CMakeLists.txt
index c1f9cbf..fd1d4a5 100644 (file)
--- a/examples/gras/rpc/CMakeLists.txt
+++ b/examples/gras/rpc/CMakeLists.txt
@@ -1,15 +1,15 @@
 cmake_minimum_required(VERSION 2.6)
 
-set_source_files_properties(_rpc_simulator.c _rpc_client.c _rpc_forwarder.c _rpc_server.c
+set_source_files_properties(${PROJECT_DIRECTORY}/examples/gras/rpc/_rpc_simulator.c ${PROJECT_DIRECTORY}/examples/gras/rpc/_rpc_client.c ${PROJECT_DIRECTORY}/examples/gras/rpc/_rpc_forwarder.c ${PROJECT_DIRECTORY}/examples/gras/rpc/_rpc_server.c
 PROPERTIES GENERATED true)
 
 set(EXECUTABLE_OUTPUT_PATH "./")
 set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib")
 
-add_executable(rpc_simulator _rpc_simulator.c rpc.c)
-add_executable(rpc_client _rpc_client.c rpc.c)
-add_executable(rpc_forwarder _rpc_forwarder.c rpc.c)
-add_executable(rpc_server _rpc_server.c rpc.c)
+add_executable(rpc_simulator ${PROJECT_DIRECTORY}/examples/gras/rpc/_rpc_simulator.c ${PROJECT_DIRECTORY}/examples/gras/rpc/rpc.c)
+add_executable(rpc_client ${PROJECT_DIRECTORY}/examples/gras/rpc/_rpc_client.c ${PROJECT_DIRECTORY}/examples/gras/rpc/rpc.c)
+add_executable(rpc_forwarder ${PROJECT_DIRECTORY}/examples/gras/rpc/_rpc_forwarder.c ${PROJECT_DIRECTORY}/examples/gras/rpc/rpc.c)
+add_executable(rpc_server ${PROJECT_DIRECTORY}/examples/gras/rpc/_rpc_server.c ${PROJECT_DIRECTORY}/examples/gras/rpc/rpc.c)
 
 ### Add definitions for compile
 target_link_libraries(rpc_simulator simgrid pthread m -fprofile-arcs)

diff --git a/examples/gras/spawn/CMakeLists.txt b/examples/gras/spawn/CMakeLists.txt
index cc5e556..65af6fe 100644 (file)
--- a/examples/gras/spawn/CMakeLists.txt
+++ b/examples/gras/spawn/CMakeLists.txt
@@ -1,14 +1,14 @@
 cmake_minimum_required(VERSION 2.6)
 
-set_source_files_properties(_spawn_simulator.c _spawn_child.c _spawn_father.c
+set_source_files_properties(${PROJECT_DIRECTORY}/examples/gras/spawn/_spawn_simulator.c ${PROJECT_DIRECTORY}/examples/gras/spawn/_spawn_child.c ${PROJECT_DIRECTORY}/examples/gras/spawn/_spawn_father.c
 PROPERTIES GENERATED true)
 
 set(EXECUTABLE_OUTPUT_PATH "./")
 set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib")
 
-add_executable(spawn_simulator _spawn_simulator.c spawn_father.c spawn_child.c spawn_common.c)
-add_executable(spawn_child _spawn_child.c spawn_child.c spawn_common.c)
-add_executable(spawn_father _spawn_father.c  spawn_father.c spawn_child.c spawn_common.c)
+add_executable(spawn_simulator ${PROJECT_DIRECTORY}/examples/gras/spawn/_spawn_simulator.c ${PROJECT_DIRECTORY}/examples/gras/spawn/spawn_father.c ${PROJECT_DIRECTORY}/examples/gras/spawn/spawn_child.c ${PROJECT_DIRECTORY}/examples/gras/spawn/spawn_common.c)
+add_executable(spawn_child ${PROJECT_DIRECTORY}/examples/gras/spawn/_spawn_child.c ${PROJECT_DIRECTORY}/examples/gras/spawn/spawn_child.c ${PROJECT_DIRECTORY}/examples/gras/spawn/spawn_common.c)
+add_executable(spawn_father ${PROJECT_DIRECTORY}/examples/gras/spawn/_spawn_father.c  ${PROJECT_DIRECTORY}/examples/gras/spawn/spawn_father.c ${PROJECT_DIRECTORY}/examples/gras/spawn/spawn_child.c ${PROJECT_DIRECTORY}/examples/gras/spawn/spawn_common.c)
 
 ### Add definitions for compile
 target_link_libraries(spawn_simulator simgrid pthread m -fprofile-arcs)

diff --git a/examples/gras/synchro/CMakeLists.txt b/examples/gras/synchro/CMakeLists.txt
index 50a16a1..d346ac9 100644 (file)
--- a/examples/gras/synchro/CMakeLists.txt
+++ b/examples/gras/synchro/CMakeLists.txt
@@ -1,13 +1,13 @@
 cmake_minimum_required(VERSION 2.6)
 
-set_source_files_properties(_synchro_simulator.c _synchro_philosopher.c
+set_source_files_properties(${PROJECT_DIRECTORY}/examples/gras/synchro/_synchro_simulator.c ${PROJECT_DIRECTORY}/examples/gras/synchro/_synchro_philosopher.c
 PROPERTIES GENERATED true)
 
 set(EXECUTABLE_OUTPUT_PATH "./")
 set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib")
 
-add_executable(synchro_simulator _synchro_simulator.c philosopher.c)
-add_executable(synchro_philosopher _synchro_philosopher.c  philosopher.c)
+add_executable(synchro_simulator ${PROJECT_DIRECTORY}/examples/gras/synchro/_synchro_simulator.c ${PROJECT_DIRECTORY}/examples/gras/synchro/philosopher.c)
+add_executable(synchro_philosopher ${PROJECT_DIRECTORY}/examples/gras/synchro/_synchro_philosopher.c  ${PROJECT_DIRECTORY}/examples/gras/synchro/philosopher.c)
 
 ### Add definitions for compile
 target_link_libraries(synchro_simulator simgrid pthread m -fprofile-arcs)

diff --git a/examples/gras/timer/CMakeLists.txt b/examples/gras/timer/CMakeLists.txt
index 4709602..d328721 100644 (file)
--- a/examples/gras/timer/CMakeLists.txt
+++ b/examples/gras/timer/CMakeLists.txt
@@ -1,13 +1,13 @@
 cmake_minimum_required(VERSION 2.6)
 
-set_source_files_properties(_timer_simulator.c _timer_client.c
+set_source_files_properties(${PROJECT_DIRECTORY}/examples/gras/timer/_timer_simulator.c ${PROJECT_DIRECTORY}/examples/gras/timer/_timer_client.c
 PROPERTIES GENERATED true)
 
 set(EXECUTABLE_OUTPUT_PATH "./")
 set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib")
 
-add_executable(timer_simulator _timer_simulator.c timer.c)
-add_executable(timer_client _timer_client.c timer.c)
+add_executable(timer_simulator ${PROJECT_DIRECTORY}/examples/gras/timer/_timer_simulator.c ${PROJECT_DIRECTORY}/examples/gras/timer/timer.c)
+add_executable(timer_client ${PROJECT_DIRECTORY}/examples/gras/timer/_timer_client.c ${PROJECT_DIRECTORY}/examples/gras/timer/timer.c)
 
 ### Add definitions for compile
 target_link_libraries(timer_simulator simgrid pthread m -fprofile-arcs)

diff --git a/examples/simdag/CMakeLists.txt b/examples/simdag/CMakeLists.txt
index da8c5fd..4a87805 100644 (file)
--- a/examples/simdag/CMakeLists.txt
+++ b/examples/simdag/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 2.6)
 
-set(EXECUTABLE_OUTPUT_PATH "./")
+set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/examples/simdag/")
 set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib")
 
 add_executable(ex_sd_test sd_test.c)
@@ -13,12 +13,12 @@ target_link_libraries(ex_sd_test2 simgrid pthread m -fprofile-arcs)
 add_custom_command(TARGET ex_sd_test
 POST_BUILD
 COMMAND "cp" 
-ARGS ./ex_sd_test ./sd_test
-WORKING_DIRECTORY "${PROJECT_DIRECTORY}/examples/simdag"
+ARGS ${PROJECT_DIRECTORY}/examples/simdag/ex_sd_test ${PROJECT_DIRECTORY}/examples/simdag/sd_test
+WORKING_DIRECTORY "${PROJECT_DIRECTORY}/examples/simdag/"
 )
 add_custom_command(TARGET ex_sd_test2
 POST_BUILD
 COMMAND "cp" 
-ARGS ./ex_sd_test2 ./sd_test2
-WORKING_DIRECTORY "${PROJECT_DIRECTORY}/examples/simdag"
+ARGS ${PROJECT_DIRECTORY}/examples/simdag/ex_sd_test2 ${PROJECT_DIRECTORY}/examples/simdag/sd_test2
+WORKING_DIRECTORY "${PROJECT_DIRECTORY}/examples/simdag/"
 )

diff --git a/include/surf/simgrid_dtd.h b/include/surf/simgrid_dtd.h
index dd70420..454c4dd 100644 (file)
--- a/include/surf/simgrid_dtd.h
+++ b/include/surf/simgrid_dtd.h
@@ -1,5 +1,5 @@
-/* XML processor/application API for /home/mquinson/Code/simgrid/src/surf/simgrid.dtd.
- * Generated 2010/04/14 12:16:24.
+/* XML processor/application API for /home/navarrop/Developments/simgrid/src/surf/simgrid.dtd.
+ * Generated 2010/04/14 18:52:05.
  *
  * This program was generated with the FleXML XML processor generator.
  * FleXML is Copyright (C) 1999-2005 Kristoffer Rose.  All rights reserved.
@@ -148,8 +148,6 @@ typedef int AT_surfxml_platform_xmlns_c_link;
 #define AU_surfxml_platform_xmlns_c_link NULL
 typedef int AT_surfxml_link_bandwidth_file;
 #define AU_surfxml_link_bandwidth_file NULL
-typedef int AT_surfxml_host_vivaldi;
-#define AU_surfxml_host_vivaldi NULL
 typedef int AT_surfxml_random_id;
 #define AU_surfxml_random_id NULL
 typedef int AT_surfxml_set_radical;
@@ -288,8 +286,6 @@ XBT_PUBLIC_DATA(AT_surfxml_platform_xmlns_c_link ) AX_surfxml_platform_xmlns_c_l
 #define A_surfxml_platform_xmlns_c_link (surfxml_bufferstack + AX_surfxml_platform_xmlns_c_link)
 XBT_PUBLIC_DATA(AT_surfxml_link_bandwidth_file ) AX_surfxml_link_bandwidth_file;
 #define A_surfxml_link_bandwidth_file (surfxml_bufferstack + AX_surfxml_link_bandwidth_file)
-XBT_PUBLIC_DATA(AT_surfxml_host_vivaldi ) AX_surfxml_host_vivaldi;
-#define A_surfxml_host_vivaldi (surfxml_bufferstack + AX_surfxml_host_vivaldi)
 XBT_PUBLIC_DATA(AT_surfxml_random_id ) AX_surfxml_random_id;
 #define A_surfxml_random_id (surfxml_bufferstack + AX_surfxml_random_id)
 XBT_PUBLIC_DATA(AT_surfxml_set_radical ) AX_surfxml_set_radical;

diff --git a/include/xbt/graphxml.h b/include/xbt/graphxml.h
index bd949dd..fbb9427 100644 (file)
--- a/include/xbt/graphxml.h
+++ b/include/xbt/graphxml.h
@@ -1,5 +1,5 @@
-/* XML processor/application API for /home/mquinson/Code/simgrid/src/xbt/graphxml.dtd.
- * Generated 2010/04/06 12:44:26.
+/* XML processor/application API for /home/navarrop/Developments/simgrid/src/xbt/graphxml.dtd.
+ * Generated 2010/04/14 18:52:06.
  *
  * This program was generated with the FleXML XML processor generator.
  * FleXML is Copyright (C) 1999-2005 Kristoffer Rose.  All rights reserved.

diff --git a/teshsuite/gras/empty_main/CMakeLists.txt b/teshsuite/gras/empty_main/CMakeLists.txt
index 7949dce..2671a9f 100644 (file)
--- a/teshsuite/gras/empty_main/CMakeLists.txt
+++ b/teshsuite/gras/empty_main/CMakeLists.txt
@@ -1,13 +1,13 @@
 cmake_minimum_required(VERSION 2.6)
 
-set_source_files_properties(_empty_main_function.c _empty_main_simulator.c
+set_source_files_properties(${PROJECT_DIRECTORY}/teshsuite/gras/empty_main/_empty_main_function.c ${PROJECT_DIRECTORY}/teshsuite/gras/empty_main/_empty_main_simulator.c
 PROPERTIES GENERATED true)
 
 set(EXECUTABLE_OUTPUT_PATH "./")
 set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib")
 
-add_executable(empty_main_function     empty_main.c _empty_main_function.c)
-add_executable(empty_main_simulator    empty_main.c _empty_main_simulator.c)
+add_executable(empty_main_function     ${PROJECT_DIRECTORY}/teshsuite/gras/empty_main/empty_main.c ${PROJECT_DIRECTORY}/teshsuite/gras/empty_main/_empty_main_function.c)
+add_executable(empty_main_simulator    ${PROJECT_DIRECTORY}/teshsuite/gras/empty_main/empty_main.c ${PROJECT_DIRECTORY}/teshsuite/gras/empty_main/_empty_main_simulator.c)
 
 ### Add definitions for compile
 target_link_libraries(empty_main_simulator simgrid m pthread -fprofile-arcs)

diff --git a/teshsuite/gras/msg_handle/CMakeLists.txt b/teshsuite/gras/msg_handle/CMakeLists.txt
index 82921c0..61c3edb 100644 (file)
--- a/teshsuite/gras/msg_handle/CMakeLists.txt
+++ b/teshsuite/gras/msg_handle/CMakeLists.txt
@@ -1,14 +1,14 @@
 cmake_minimum_required(VERSION 2.6)
 
-set_source_files_properties(_msg_handle_simulator.c _msg_handle_client.c _msg_handle_server.c
+set_source_files_properties(${PROJECT_DIRECTORY}/teshsuite/gras/msg_handle/_msg_handle_simulator.c ${PROJECT_DIRECTORY}/teshsuite/gras/msg_handle/_msg_handle_client.c ${PROJECT_DIRECTORY}/teshsuite/gras/msg_handle/_msg_handle_server.c
 PROPERTIES GENERATED true)
 
 set(EXECUTABLE_OUTPUT_PATH "./")
 set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib")
 
-add_executable(msg_handle_simulator msg_handle.c _msg_handle_simulator.c)
-add_executable(msg_handle_client msg_handle.c _msg_handle_client.c)
-add_executable(msg_handle_server msg_handle.c _msg_handle_server.c)
+add_executable(msg_handle_simulator ${PROJECT_DIRECTORY}/teshsuite/gras/msg_handle/msg_handle.c ${PROJECT_DIRECTORY}/teshsuite/gras/msg_handle/_msg_handle_simulator.c)
+add_executable(msg_handle_client ${PROJECT_DIRECTORY}/teshsuite/gras/msg_handle/msg_handle.c ${PROJECT_DIRECTORY}/teshsuite/gras/msg_handle/_msg_handle_client.c)
+add_executable(msg_handle_server ${PROJECT_DIRECTORY}/teshsuite/gras/msg_handle/msg_handle.c ${PROJECT_DIRECTORY}/teshsuite/gras/msg_handle/_msg_handle_server.c)
 
 ### Add definitions for compile
 target_link_libraries(msg_handle_simulator simgrid m pthread -fprofile-arcs)

diff --git a/teshsuite/gras/small_sleep/CMakeLists.txt b/teshsuite/gras/small_sleep/CMakeLists.txt
index 3684c2c..2eab97e 100644 (file)
--- a/teshsuite/gras/small_sleep/CMakeLists.txt
+++ b/teshsuite/gras/small_sleep/CMakeLists.txt
@@ -1,13 +1,13 @@
 cmake_minimum_required(VERSION 2.6)
 
-set_source_files_properties(_small_sleep_function.c _small_sleep_simulator.c
+set_source_files_properties(${PROJECT_DIRECTORY}/teshsuite/gras/small_sleep/_small_sleep_function.c ${PROJECT_DIRECTORY}/teshsuite/gras/small_sleep/_small_sleep_simulator.c
 PROPERTIES GENERATED true)
 
 set(EXECUTABLE_OUTPUT_PATH "./")
 set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib")
 
-add_executable(small_sleep_function    small_sleep.c _small_sleep_function.c)
-add_executable(small_sleep_simulator   small_sleep.c _small_sleep_simulator.c)
+add_executable(small_sleep_function    ${PROJECT_DIRECTORY}/teshsuite/gras/small_sleep/small_sleep.c ${PROJECT_DIRECTORY}/teshsuite/gras/small_sleep/_small_sleep_function.c)
+add_executable(small_sleep_simulator   ${PROJECT_DIRECTORY}/teshsuite/gras/small_sleep/small_sleep.c ${PROJECT_DIRECTORY}/teshsuite/gras/small_sleep/_small_sleep_simulator.c)
 
 ### Add definitions for compile
 target_link_libraries(small_sleep_simulator simgrid m pthread -fprofile-arcs)

diff --git a/testsuite/simdag/CMakeLists.txt b/testsuite/simdag/CMakeLists.txt
index e1448df..3449d06 100644 (file)
--- a/testsuite/simdag/CMakeLists.txt
+++ b/testsuite/simdag/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.6)
 set(EXECUTABLE_OUTPUT_PATH "./")
 set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib")
 
-add_executable(sd_test "sd_test.c")
+add_executable(sd_test sd_test.c)
 
 ### Add definitions for compile
 target_link_libraries(sd_test simgrid m -fprofile-arcs)