Generate files correctely with gras_stub_generator.

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

diff --git a/buildtools/Cmake/src/CMakeMakeExeLib.txt b/buildtools/Cmake/src/CMakeMakeExeLib.txt
index 30e6bdf..e4ac81d 100644 (file)
--- a/buildtools/Cmake/src/CMakeMakeExeLib.txt
+++ b/buildtools/Cmake/src/CMakeMakeExeLib.txt
@@ -136,54 +136,4 @@ add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/metaxml)
 add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/properties)
 if(enable_smpi)
        add_subdirectory(${PROJECT_DIRECTORY}/examples/smpi)
-endif(enable_smpi)
-
-# FIXME: should be killed once integrated properly in examples' CMakeList.txt
-set(targets_depended_of_gras_stub_generator
-ping_client
-ping_server
-ping_simulator
-rpc_client
-rpc_forwarder
-rpc_server
-rpc_simulator
-spawn_child
-spawn_father
-spawn_simulator
-timer_client
-timer_simulator
-chrono_multiplier
-chrono_simulator
-simple_token_node
-simple_token_simulator
-mmrpc_client
-mmrpc_server
-mmrpc_simulator
-all2all_receiver
-all2all_sender
-all2all_simulator
-pmm_master
-pmm_simulator
-pmm_slave
-synchro_philosopher
-synchro_simulator
-properties_alice
-properties_bob
-properties_simulator
-msg_handle_client
-msg_handle_server
-msg_handle_simulator
-empty_main_function
-empty_main_simulator
-small_sleep_function
-small_sleep_simulator
-bandwidth_maestro
-bandwidth_sensor
-bandwidth_simulator
-saturate_maestro
-saturate_sensor
-saturate_simulator
-)
-foreach(file ${targets_depended_of_gras_stub_generator})
-       add_dependencies(${file} gras_stub_generator)
-endforeach(file ${targets_depended_of_gras_stub_generator})
+endif(enable_smpi)
\ No newline at end of file

diff --git a/examples/amok/bandwidth/CMakeLists.txt b/examples/amok/bandwidth/CMakeLists.txt
index fa2e267..dc38721 100644 (file)
--- a/examples/amok/bandwidth/CMakeLists.txt
+++ b/examples/amok/bandwidth/CMakeLists.txt
@@ -1,14 +1,27 @@
 cmake_minimum_required(VERSION 2.6)
 
-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_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/_bandwidth_simulator.c
+                                                       ${CMAKE_CURRENT_BINARY_DIR}/_bandwidth_maestro.c
+                                                       ${CMAKE_CURRENT_BINARY_DIR}/_bandwidth_sensor.c
+                                                       PROPERTIES GENERATED true)
 
-set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/examples/amok/bandwidth/")
+set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_SOURCE_DIR}")
 
-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_executable(bandwidth_simulator     ${CMAKE_CURRENT_BINARY_DIR}/_bandwidth_simulator.c
+                                                                       ${CMAKE_CURRENT_SOURCE_DIR}/bandwidth.c)
+add_executable(bandwidth_maestro       ${CMAKE_CURRENT_BINARY_DIR}/_bandwidth_maestro.c
+                                                                       ${CMAKE_CURRENT_SOURCE_DIR}/bandwidth.c)
+add_executable(bandwidth_sensor ${CMAKE_CURRENT_BINARY_DIR}/_bandwidth_sensor.c
+                                                               ${CMAKE_CURRENT_SOURCE_DIR}/bandwidth.c)
 
+add_custom_command(
+                                       OUTPUT  ${CMAKE_CURRENT_BINARY_DIR}/_bandwidth_simulator.c
+                                                       ${CMAKE_CURRENT_BINARY_DIR}/_bandwidth_maestro.c
+                                                       ${CMAKE_CURRENT_BINARY_DIR}/_bandwidth_sensor.c
+                                       DEPENDS gras_stub_generator ${CMAKE_CURRENT_SOURCE_DIR}/bandwidth.xml
+                                       COMMAND ${CMAKE_BINARY_DIR}/bin/gras_stub_generator bandwidth ${CMAKE_CURRENT_SOURCE_DIR}/bandwidth.xml
+                                       )
+                                       
 ### Add definitions for compile
 target_link_libraries(bandwidth_simulator simgrid pthread m -fprofile-arcs)
 target_link_libraries(bandwidth_maestro gras pthread m -fprofile-arcs)

diff --git a/examples/amok/saturate/CMakeLists.txt b/examples/amok/saturate/CMakeLists.txt
index f33b9ef..a8e2787 100644 (file)
--- a/examples/amok/saturate/CMakeLists.txt
+++ b/examples/amok/saturate/CMakeLists.txt
@@ -1,15 +1,28 @@
 cmake_minimum_required(VERSION 2.6)
 
-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_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/_saturate_simulator.c
+                                                       ${CMAKE_CURRENT_BINARY_DIR}/_saturate_maestro.c
+                                                       ${CMAKE_CURRENT_BINARY_DIR}/_saturate_sensor.c
+                                                       PROPERTIES GENERATED true)
+                                                       
+set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_SOURCE_DIR}")
 
-set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/examples/amok/saturate/")
-
-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_executable(saturate_simulator      ${CMAKE_CURRENT_BINARY_DIR}/_saturate_simulator.c
+                                                                       ${CMAKE_CURRENT_SOURCE_DIR}/saturate.c)
+add_executable(saturate_maestro ${CMAKE_CURRENT_BINARY_DIR}/_saturate_maestro.c
+                                                               ${CMAKE_CURRENT_SOURCE_DIR}/saturate.c)
+add_executable(saturate_sensor         ${CMAKE_CURRENT_BINARY_DIR}/_saturate_sensor.c
+                                                               ${CMAKE_CURRENT_SOURCE_DIR}/saturate.c)
 
+add_custom_command(
+                                       OUTPUT  ${CMAKE_CURRENT_BINARY_DIR}/_saturate_simulator.c
+                                                       ${CMAKE_CURRENT_BINARY_DIR}/_saturate_maestro.c
+                                                       ${CMAKE_CURRENT_BINARY_DIR}/_saturate_sensor.c
+                                       DEPENDS gras_stub_generator ${CMAKE_CURRENT_SOURCE_DIR}/saturate.xml
+                                       COMMAND ${CMAKE_BINARY_DIR}/bin/gras_stub_generator saturate ${CMAKE_CURRENT_SOURCE_DIR}/saturate.xml
+                                       )
+                                       
 ### Add definitions for compile
 target_link_libraries(saturate_simulator simgrid pthread m -fprofile-arcs)
 target_link_libraries(saturate_maestro gras pthread m -fprofile-arcs)
-target_link_libraries(saturate_sensor gras pthread m -fprofile-arcs)
+target_link_libraries(saturate_sensor gras pthread m -fprofile-arcs)
\ No newline at end of file

diff --git a/examples/gras/all2all/CMakeLists.txt b/examples/gras/all2all/CMakeLists.txt
index da0650c..3cc7db2 100644 (file)
--- a/examples/gras/all2all/CMakeLists.txt
+++ b/examples/gras/all2all/CMakeLists.txt
@@ -1,13 +1,26 @@
 cmake_minimum_required(VERSION 2.6)
 
-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_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/_all2all_simulator.c
+                                                       ${CMAKE_CURRENT_BINARY_DIR}/_all2all_sender.c
+                                                       ${CMAKE_CURRENT_BINARY_DIR}/_all2all_receiver.c
+                                                       PROPERTIES GENERATED true)
 
-set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/examples/gras/all2all/")
+set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_SOURCE_DIR}")
 
-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_executable(all2all_simulator       ${CMAKE_CURRENT_BINARY_DIR}/_all2all_simulator.c
+                                                                       ${CMAKE_CURRENT_SOURCE_DIR}/all2all.c)
+add_executable(all2all_sender  ${CMAKE_CURRENT_BINARY_DIR}/_all2all_sender.c
+                                                               ${CMAKE_CURRENT_SOURCE_DIR}/all2all.c)
+add_executable(all2all_receiver ${CMAKE_CURRENT_BINARY_DIR}/_all2all_receiver.c
+                                                               ${CMAKE_CURRENT_SOURCE_DIR}/all2all.c)
+                                                               
+add_custom_command(
+                                       OUTPUT  ${CMAKE_CURRENT_BINARY_DIR}/_all2all_simulator.c
+                                                       ${CMAKE_CURRENT_BINARY_DIR}/_all2all_sender.c
+                                                       ${CMAKE_CURRENT_BINARY_DIR}/_all2all_receiver.c
+                                       DEPENDS gras_stub_generator ${CMAKE_CURRENT_SOURCE_DIR}/all2all.xml
+                                       COMMAND ${CMAKE_BINARY_DIR}/bin/gras_stub_generator all2all ${CMAKE_CURRENT_SOURCE_DIR}/all2all.xml
+                                       )
 
 ### 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 5c4b379..a31dae2 100644 (file)
--- a/examples/gras/chrono/CMakeLists.txt
+++ b/examples/gras/chrono/CMakeLists.txt
@@ -1,13 +1,23 @@
 cmake_minimum_required(VERSION 2.6)
 
-set_source_files_properties(${PROJECT_DIRECTORY}/examples/gras/chrono/_chrono_simulator.c ${PROJECT_DIRECTORY}/examples/gras/chrono/_chrono_multiplier.c
-PROPERTIES GENERATED true)
+set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/_chrono_simulator.c
+                                                       ${CMAKE_CURRENT_BINARY_DIR}/_chrono_multiplier.c
+                                                       PROPERTIES GENERATED true)
 
-set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/examples/gras/chrono/")
+set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_SOURCE_DIR}")
 
-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_executable(chrono_simulator ${CMAKE_CURRENT_BINARY_DIR}/_chrono_simulator.c
+                                                               ${CMAKE_CURRENT_SOURCE_DIR}/chrono.c)
+add_executable(chrono_multiplier       ${CMAKE_CURRENT_BINARY_DIR}/_chrono_multiplier.c
+                                                                       ${CMAKE_CURRENT_SOURCE_DIR}/chrono.c)
+                                                                       
+add_custom_command(
+  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/_chrono_simulator.c
+         ${CMAKE_CURRENT_BINARY_DIR}/_chrono_multiplier.c
+  DEPENDS gras_stub_generator ${CMAKE_CURRENT_SOURCE_DIR}/chrono.xml
+  COMMAND ${CMAKE_BINARY_DIR}/bin/gras_stub_generator chrono ${CMAKE_CURRENT_SOURCE_DIR}/chrono.xml
+)
 
 ### Add definitions for compile
 target_link_libraries(chrono_simulator simgrid pthread m -fprofile-arcs)
-target_link_libraries(chrono_multiplier gras pthread m -fprofile-arcs)
+target_link_libraries(chrono_multiplier gras pthread m -fprofile-arcs)
\ No newline at end of file

diff --git a/examples/gras/mmrpc/CMakeLists.txt b/examples/gras/mmrpc/CMakeLists.txt
index 7632bb6..3216e0e 100644 (file)
--- a/examples/gras/mmrpc/CMakeLists.txt
+++ b/examples/gras/mmrpc/CMakeLists.txt
@@ -1,14 +1,31 @@
 cmake_minimum_required(VERSION 2.6)
 
-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_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/_mmrpc_simulator.c 
+                                                       ${CMAKE_CURRENT_BINARY_DIR}/_mmrpc_client.c 
+                                                       ${CMAKE_CURRENT_BINARY_DIR}/_mmrpc_server.c
+                                                       PROPERTIES GENERATED true)
 
-set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/examples/gras/mmrpc/")
+set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_SOURCE_DIR}")
 
-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_executable(mmrpc_simulator         ${CMAKE_CURRENT_BINARY_DIR}/_mmrpc_simulator.c 
+                                                               ${CMAKE_CURRENT_SOURCE_DIR}/mmrpc_common.c
+                                                               ${CMAKE_CURRENT_SOURCE_DIR}/mmrpc_client.c
+                                                               ${CMAKE_CURRENT_SOURCE_DIR}/mmrpc_server.c)
+add_executable(mmrpc_client ${CMAKE_CURRENT_BINARY_DIR}/_mmrpc_client.c
+                                                       ${CMAKE_CURRENT_SOURCE_DIR}/mmrpc_common.c
+                                                       ${CMAKE_CURRENT_SOURCE_DIR}/mmrpc_client.c)
+add_executable(mmrpc_server ${CMAKE_CURRENT_BINARY_DIR}/_mmrpc_server.c
+                                                       ${CMAKE_CURRENT_SOURCE_DIR}/mmrpc_common.c
+                                                       ${CMAKE_CURRENT_SOURCE_DIR}/mmrpc_server.c)
 
+add_custom_command(
+                                       OUTPUT  ${CMAKE_CURRENT_BINARY_DIR}/_mmrpc_simulator.c 
+                                                       ${CMAKE_CURRENT_BINARY_DIR}/_mmrpc_client.c 
+                                                       ${CMAKE_CURRENT_BINARY_DIR}/_mmrpc_server.c
+                                       DEPENDS gras_stub_generator ${CMAKE_CURRENT_SOURCE_DIR}/mmrpc.xml
+                                       COMMAND ${CMAKE_BINARY_DIR}/bin/gras_stub_generator mmrpc ${CMAKE_CURRENT_SOURCE_DIR}/mmrpc.xml
+                                       )
+                                       
 ### Add definitions for compile
 target_link_libraries(mmrpc_simulator simgrid pthread m -fprofile-arcs)
 target_link_libraries(mmrpc_client gras 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 39e99c0..87299f1 100644 (file)
--- a/examples/gras/mutual_exclusion/simple_token/CMakeLists.txt
+++ b/examples/gras/mutual_exclusion/simple_token/CMakeLists.txt
@@ -1,12 +1,22 @@
 cmake_minimum_required(VERSION 2.6)
 
-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_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/_simple_token_simulator.c
+                                                       ${CMAKE_CURRENT_BINARY_DIR}/_simple_token_node.c
+                                                       PROPERTIES GENERATED true)
 
-set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/examples/gras/mutual_exclusion/simple_token/")
+set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_SOURCE_DIR}")
 
-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_executable(simple_token_simulator  ${CMAKE_CURRENT_BINARY_DIR}/_simple_token_simulator.c
+                                                                               ${CMAKE_CURRENT_SOURCE_DIR}/simple_token.c)
+add_executable(simple_token_node       ${CMAKE_CURRENT_BINARY_DIR}/_simple_token_node.c
+                                                                       ${CMAKE_CURRENT_SOURCE_DIR}/simple_token.c)
+                                                                       
+add_custom_command(
+                                       OUTPUT  ${CMAKE_CURRENT_BINARY_DIR}/_simple_token_simulator.c 
+                                               ${CMAKE_CURRENT_BINARY_DIR}/_simple_token_node.c 
+                                       DEPENDS gras_stub_generator ${CMAKE_CURRENT_SOURCE_DIR}/simple_token.xml
+                                       COMMAND ${CMAKE_BINARY_DIR}/bin/gras_stub_generator simple_token ${CMAKE_CURRENT_SOURCE_DIR}/simple_token.xml
+                                       )
 
 ### 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 c9dc452..82b337d 100644 (file)
--- a/examples/gras/ping/CMakeLists.txt
+++ b/examples/gras/ping/CMakeLists.txt
@@ -1,20 +1,29 @@
 cmake_minimum_required(VERSION 2.6)
 
-set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/_ping_simulator.c ${CMAKE_CURRENT_BINARY_DIR}/_ping_client.c ${CMAKE_CURRENT_BINARY_DIR}/_ping_server.c
+set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/_ping_simulator.c
+                                                       ${CMAKE_CURRENT_BINARY_DIR}/_ping_client.c 
+                                                       ${CMAKE_CURRENT_BINARY_DIR}/_ping_server.c
                             PROPERTIES GENERATED true)
 
-set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
+set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_SOURCE_DIR}")
 
-add_executable(ping_simulator ${CMAKE_CURRENT_BINARY_DIR}/_ping_simulator.c ping_server.c ping_client.c ping_common.c)
-add_executable(ping_client    ${CMAKE_CURRENT_BINARY_DIR}/_ping_client.c    ping_client.c ping_common.c)
-add_executable(ping_server    ${CMAKE_CURRENT_BINARY_DIR}/_ping_server.c    ping_server.c ping_common.c)
+add_executable(ping_simulator  ${CMAKE_CURRENT_BINARY_DIR}/_ping_simulator.c
+                                                               ${CMAKE_CURRENT_SOURCE_DIR}/ping_server.c
+                                                               ${CMAKE_CURRENT_SOURCE_DIR}/ping_client.c
+                                                               ${CMAKE_CURRENT_SOURCE_DIR}/ping_common.c)
+add_executable(ping_client     ${CMAKE_CURRENT_BINARY_DIR}/_ping_client.c
+                                                               ${CMAKE_CURRENT_SOURCE_DIR}/ping_client.c
+                                                               ${CMAKE_CURRENT_SOURCE_DIR}/ping_common.c)
+add_executable(ping_server     ${CMAKE_CURRENT_BINARY_DIR}/_ping_server.c
+                                                               ${CMAKE_CURRENT_SOURCE_DIR}/ping_server.c
+                                                               ${CMAKE_CURRENT_SOURCE_DIR}/ping_common.c)
 add_custom_command(
-  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/_ping_simulator.c 
-         ${CMAKE_CURRENT_BINARY_DIR}/_ping_client.c 
-        ${CMAKE_CURRENT_BINARY_DIR}/_ping_server.c
-  DEPENDS gras_stub_generator ${CMAKE_CURRENT_SOURCE_DIR}/ping.xml
-  COMMAND ${CMAKE_BINARY_DIR}/bin/gras_stub_generator ping ${CMAKE_CURRENT_SOURCE_DIR}/ping.xml
-)
+                                       OUTPUT  ${CMAKE_CURRENT_BINARY_DIR}/_ping_simulator.c 
+                                               ${CMAKE_CURRENT_BINARY_DIR}/_ping_client.c 
+                                                       ${CMAKE_CURRENT_BINARY_DIR}/_ping_server.c
+                                       DEPENDS gras_stub_generator ${CMAKE_CURRENT_SOURCE_DIR}/ping.xml
+                                       COMMAND ${CMAKE_BINARY_DIR}/bin/gras_stub_generator ping ${CMAKE_CURRENT_SOURCE_DIR}/ping.xml
+                                       )
 
 ### 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 cfc9d92..a1b6b87 100644 (file)
--- a/examples/gras/pmm/CMakeLists.txt
+++ b/examples/gras/pmm/CMakeLists.txt
@@ -1,13 +1,26 @@
 cmake_minimum_required(VERSION 2.6)
 
-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_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/_pmm_simulator.c 
+                                                       ${CMAKE_CURRENT_BINARY_DIR}/_pmm_slave.c 
+                                                       ${CMAKE_CURRENT_BINARY_DIR}/_pmm_master.c
+                                                       PROPERTIES GENERATED true)
 
-set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/examples/gras/pmm/")
+set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_SOURCE_DIR}")
 
-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_executable(pmm_simulator   ${CMAKE_CURRENT_BINARY_DIR}/_pmm_simulator.c 
+                                                               ${CMAKE_CURRENT_SOURCE_DIR}/pmm.c)
+add_executable(pmm_slave       ${CMAKE_CURRENT_BINARY_DIR}/_pmm_slave.c 
+                                                       ${CMAKE_CURRENT_SOURCE_DIR}/pmm.c)
+add_executable(pmm_master      ${CMAKE_CURRENT_BINARY_DIR}/_pmm_master.c 
+                                                       ${CMAKE_CURRENT_SOURCE_DIR}/pmm.c)
+
+add_custom_command(
+                                       OUTPUT  ${CMAKE_CURRENT_BINARY_DIR}/_pmm_simulator.c 
+                                                       ${CMAKE_CURRENT_BINARY_DIR}/_pmm_slave.c 
+                                                       ${CMAKE_CURRENT_BINARY_DIR}/_pmm_master.c
+                                       DEPENDS gras_stub_generator ${CMAKE_CURRENT_SOURCE_DIR}/pmm.xml
+                                       COMMAND ${CMAKE_BINARY_DIR}/bin/gras_stub_generator pmm ${CMAKE_CURRENT_SOURCE_DIR}/pmm.xml
+                                       )
 
 ### 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 e1ce89d..ab5453b 100644 (file)
--- a/examples/gras/properties/CMakeLists.txt
+++ b/examples/gras/properties/CMakeLists.txt
@@ -1,14 +1,26 @@
 cmake_minimum_required(VERSION 2.6)
 
-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_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/_properties_simulator.c
+                                                       ${CMAKE_CURRENT_BINARY_DIR}/_properties_alice.c
+                                                       ${CMAKE_CURRENT_BINARY_DIR}/_properties_bob.c
+                                                       PROPERTIES GENERATED true)
 
-set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/examples/gras/properties/")
-
-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)
+set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_SOURCE_DIR}")
 
+add_executable(properties_simulator ${CMAKE_CURRENT_BINARY_DIR}/_properties_simulator.c
+                                                                       ${CMAKE_CURRENT_SOURCE_DIR}/properties.c)
+add_executable(properties_alice ${CMAKE_CURRENT_BINARY_DIR}/_properties_alice.c
+                                                               ${CMAKE_CURRENT_SOURCE_DIR}/properties.c)
+add_executable(properties_bob  ${CMAKE_CURRENT_BINARY_DIR}/_properties_bob.c
+                                                               ${CMAKE_CURRENT_SOURCE_DIR}/properties.c)
+add_custom_command(
+                                       OUTPUT  ${CMAKE_CURRENT_BINARY_DIR}/_properties_simulator.c
+                                                       ${CMAKE_CURRENT_BINARY_DIR}/_properties_alice.c
+                                                       ${CMAKE_CURRENT_BINARY_DIR}/_properties_bob.c
+                                       DEPENDS gras_stub_generator ${CMAKE_CURRENT_SOURCE_DIR}/properties.xml
+                                       COMMAND ${CMAKE_BINARY_DIR}/bin/gras_stub_generator properties ${CMAKE_CURRENT_SOURCE_DIR}/properties.xml
+                                       )
+                                       
 ### Add definitions for compile
 target_link_libraries(properties_simulator simgrid pthread m -fprofile-arcs)
 target_link_libraries(properties_alice gras pthread m -fprofile-arcs)

diff --git a/examples/gras/rpc/CMakeLists.txt b/examples/gras/rpc/CMakeLists.txt
index b92569b..c3d99da 100644 (file)
--- a/examples/gras/rpc/CMakeLists.txt
+++ b/examples/gras/rpc/CMakeLists.txt
@@ -2,16 +2,17 @@ cmake_minimum_required(VERSION 2.6)
 
 set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/_rpc_simulator.c 
                             ${CMAKE_CURRENT_BINARY_DIR}/_rpc_client.c 
-                           ${CMAKE_CURRENT_BINARY_DIR}/_rpc_forwarder.c 
-                           ${CMAKE_CURRENT_BINARY_DIR}/_rpc_server.c
-    PROPERTIES GENERATED true)
+                                               ${CMAKE_CURRENT_BINARY_DIR}/_rpc_forwarder.c 
+                                               ${CMAKE_CURRENT_BINARY_DIR}/_rpc_server.c
+                                               PROPERTIES GENERATED true)
 
-set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
+set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_SOURCE_DIR}")
 
 add_executable(rpc_simulator ${CMAKE_CURRENT_BINARY_DIR}/_rpc_simulator.c rpc.c)
 add_executable(rpc_client    ${CMAKE_CURRENT_BINARY_DIR}/_rpc_client.c    rpc.c)
 add_executable(rpc_forwarder ${CMAKE_CURRENT_BINARY_DIR}/_rpc_forwarder.c rpc.c)
 add_executable(rpc_server    ${CMAKE_CURRENT_BINARY_DIR}/_rpc_server.c    rpc.c)
+
 add_custom_command(
   OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/_rpc_simulator.c
          ${CMAKE_CURRENT_BINARY_DIR}/_rpc_client.c

diff --git a/examples/gras/spawn/CMakeLists.txt b/examples/gras/spawn/CMakeLists.txt
index 44b9f4b..9b1bbc4 100644 (file)
--- a/examples/gras/spawn/CMakeLists.txt
+++ b/examples/gras/spawn/CMakeLists.txt
@@ -1,16 +1,36 @@
 cmake_minimum_required(VERSION 2.6)
 
-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_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 "${PROJECT_DIRECTORY}/examples/gras/spawn/")
+set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_SOURCE_DIR}")
 
-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_executable(spawn_simulator         ${CMAKE_CURRENT_BINARY_DIR}/_spawn_simulator.c 
+                                                               ${CMAKE_CURRENT_SOURCE_DIR}/spawn_father.c 
+                                                               ${CMAKE_CURRENT_SOURCE_DIR}/spawn_child.c 
+                                                               ${CMAKE_CURRENT_SOURCE_DIR}/spawn_common.c)
+add_executable(spawn_child             ${CMAKE_CURRENT_BINARY_DIR}/_spawn_child.c 
+                                                               ${CMAKE_CURRENT_SOURCE_DIR}/spawn_child.c 
+                                                               ${CMAKE_CURRENT_SOURCE_DIR}/spawn_common.c)
+add_executable(spawn_father    ${CMAKE_CURRENT_BINARY_DIR}/_spawn_father.c
+                                                               ${CMAKE_CURRENT_SOURCE_DIR}/spawn_father.c
+                                                               ${CMAKE_CURRENT_SOURCE_DIR}/spawn_child.c
+                                                               ${CMAKE_CURRENT_SOURCE_DIR}/spawn_common.c)
 
+add_custom_command(
+                                       OUTPUT  ${CMAKE_CURRENT_BINARY_DIR}/_spawn_child.c 
+                                               ${CMAKE_CURRENT_BINARY_DIR}/_spawn_father.c 
+                                                       ${CMAKE_CURRENT_BINARY_DIR}/_spawn_simulator.c
+                                       DEPENDS gras_stub_generator ${CMAKE_CURRENT_SOURCE_DIR}/spawn.xml
+                                       COMMAND ${CMAKE_BINARY_DIR}/bin/gras_stub_generator --extra-process=child spawn ${CMAKE_CURRENT_SOURCE_DIR}/spawn.xml
+                                       )
+                                       
 ### Add definitions for compile
 target_link_libraries(spawn_simulator simgrid pthread m -fprofile-arcs)
 target_link_libraries(spawn_child gras pthread m -fprofile-arcs)
 target_link_libraries(spawn_father gras pthread m -fprofile-arcs)
 
+
+

diff --git a/examples/gras/synchro/CMakeLists.txt b/examples/gras/synchro/CMakeLists.txt
index 4b56ca6..01e2c26 100644 (file)
--- a/examples/gras/synchro/CMakeLists.txt
+++ b/examples/gras/synchro/CMakeLists.txt
@@ -1,12 +1,22 @@
 cmake_minimum_required(VERSION 2.6)
 
-set_source_files_properties(${PROJECT_DIRECTORY}/examples/gras/synchro/_synchro_simulator.c ${PROJECT_DIRECTORY}/examples/gras/synchro/_synchro_philosopher.c
-PROPERTIES GENERATED true)
+set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/_synchro_simulator.c
+                                                       ${CMAKE_CURRENT_BINARY_DIR}/_synchro_philosopher.c
+                                                       PROPERTIES GENERATED true)
 
-set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/examples/gras/synchro/")
+set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_SOURCE_DIR}")
 
-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_executable(synchro_simulator       ${CMAKE_CURRENT_BINARY_DIR}/_synchro_simulator.c
+                                                                       ${CMAKE_CURRENT_SOURCE_DIR}/philosopher.c)
+add_executable(synchro_philosopher     ${CMAKE_CURRENT_BINARY_DIR}/_synchro_philosopher.c 
+                                                                       ${CMAKE_CURRENT_SOURCE_DIR}/philosopher.c)
+
+add_custom_command(
+                                       OUTPUT  ${CMAKE_CURRENT_BINARY_DIR}/_synchro_simulator.c
+                                                       ${CMAKE_CURRENT_BINARY_DIR}/_synchro_philosopher.c
+                                       DEPENDS gras_stub_generator ${CMAKE_CURRENT_SOURCE_DIR}/synchro.xml
+                                       COMMAND ${CMAKE_BINARY_DIR}/bin/gras_stub_generator synchro ${CMAKE_CURRENT_SOURCE_DIR}/synchro.xml
+                                       )
 
 ### 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 7b46583..1eef88a 100644 (file)
--- a/examples/gras/timer/CMakeLists.txt
+++ b/examples/gras/timer/CMakeLists.txt
@@ -1,12 +1,22 @@
 cmake_minimum_required(VERSION 2.6)
 
-set_source_files_properties(${PROJECT_DIRECTORY}/examples/gras/timer/_timer_simulator.c ${PROJECT_DIRECTORY}/examples/gras/timer/_timer_client.c
-PROPERTIES GENERATED true)
+set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/_timer_simulator.c
+                                                       ${CMAKE_CURRENT_BINARY_DIR}/_timer_client.c
+                                                       PROPERTIES GENERATED true)
 
-set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/examples/gras/timer/")
+set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_SOURCE_DIR}")
 
-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_executable(timer_simulator         ${CMAKE_CURRENT_BINARY_DIR}/_timer_simulator.c 
+                                                               ${CMAKE_CURRENT_SOURCE_DIR}/timer.c)
+add_executable(timer_client    ${CMAKE_CURRENT_BINARY_DIR}/_timer_client.c
+                                                               ${CMAKE_CURRENT_SOURCE_DIR}/timer.c)
+
+add_custom_command(
+  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/_timer_simulator.c
+         ${CMAKE_CURRENT_BINARY_DIR}/_timer_client.c
+  DEPENDS gras_stub_generator ${CMAKE_CURRENT_SOURCE_DIR}/timer.xml
+  COMMAND ${CMAKE_BINARY_DIR}/bin/gras_stub_generator timer ${CMAKE_CURRENT_SOURCE_DIR}/timer.xml
+)
 
 ### Add definitions for compile
 target_link_libraries(timer_simulator simgrid pthread m -fprofile-arcs)

diff --git a/teshsuite/gras/empty_main/CMakeLists.txt b/teshsuite/gras/empty_main/CMakeLists.txt
index e86114c..e8d2193 100644 (file)
--- a/teshsuite/gras/empty_main/CMakeLists.txt
+++ b/teshsuite/gras/empty_main/CMakeLists.txt
@@ -1,13 +1,23 @@
 cmake_minimum_required(VERSION 2.6)
 
-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_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/_empty_main_function.c
+                                                       ${CMAKE_CURRENT_BINARY_DIR}/_empty_main_simulator.c
+                                                       PROPERTIES GENERATED true)
 
-set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/teshsuite/gras/empty_main/")
+set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_SOURCE_DIR}")
 
-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_executable(empty_main_function     ${CMAKE_CURRENT_SOURCE_DIR}/empty_main.c
+                                                                       ${CMAKE_CURRENT_BINARY_DIR}/_empty_main_function.c)
+add_executable(empty_main_simulator    ${CMAKE_CURRENT_SOURCE_DIR}/empty_main.c
+                                                                               ${CMAKE_CURRENT_BINARY_DIR}/_empty_main_simulator.c)
 
+add_custom_command(
+                                       OUTPUT  ${CMAKE_CURRENT_BINARY_DIR}/_empty_main_function.c
+                                                       ${CMAKE_CURRENT_BINARY_DIR}/_empty_main_simulator.c
+                                       DEPENDS gras_stub_generator ${CMAKE_CURRENT_SOURCE_DIR}/empty_main.xml
+                                       COMMAND ${CMAKE_BINARY_DIR}/bin/gras_stub_generator empty_main ${CMAKE_CURRENT_SOURCE_DIR}/empty_main.xml
+                                       )
+                                       
 ### Add definitions for compile
 target_link_libraries(empty_main_simulator simgrid m pthread -fprofile-arcs)
 target_link_libraries(empty_main_function gras m pthread -fprofile-arcs)

diff --git a/teshsuite/gras/msg_handle/CMakeLists.txt b/teshsuite/gras/msg_handle/CMakeLists.txt
index 19de8c8..f76e704 100644 (file)
--- a/teshsuite/gras/msg_handle/CMakeLists.txt
+++ b/teshsuite/gras/msg_handle/CMakeLists.txt
@@ -1,13 +1,26 @@
 cmake_minimum_required(VERSION 2.6)
 
-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_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/_msg_handle_simulator.c
+                                                       ${CMAKE_CURRENT_BINARY_DIR}/_msg_handle_client.c
+                                                       ${CMAKE_CURRENT_BINARY_DIR}/_msg_handle_server.c
+                                                       PROPERTIES GENERATED true)
 
-set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/teshsuite/gras/msg_handle/")
+set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_SOURCE_DIR}")
 
-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_executable(msg_handle_simulator ${CMAKE_CURRENT_SOURCE_DIR}/msg_handle.c
+                                                                       ${CMAKE_CURRENT_BINARY_DIR}/_msg_handle_simulator.c)
+add_executable(msg_handle_client       ${CMAKE_CURRENT_SOURCE_DIR}/msg_handle.c
+                                                                       ${CMAKE_CURRENT_BINARY_DIR}/_msg_handle_client.c)
+add_executable(msg_handle_server       ${CMAKE_CURRENT_SOURCE_DIR}/msg_handle.c
+                                                                       ${CMAKE_CURRENT_BINARY_DIR}/_msg_handle_server.c)
+
+add_custom_command(
+                                       OUTPUT  ${CMAKE_CURRENT_BINARY_DIR}/_msg_handle_simulator.c
+                                                       ${CMAKE_CURRENT_BINARY_DIR}/_msg_handle_client.c
+                                                       ${CMAKE_CURRENT_BINARY_DIR}/_msg_handle_server.c
+                                       DEPENDS gras_stub_generator ${CMAKE_CURRENT_SOURCE_DIR}/msg_handle.xml
+                                       COMMAND ${CMAKE_BINARY_DIR}/bin/gras_stub_generator msg_handle ${CMAKE_CURRENT_SOURCE_DIR}/msg_handle.xml
+                                       )
 
 ### 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 07afff7..5802995 100644 (file)
--- a/teshsuite/gras/small_sleep/CMakeLists.txt
+++ b/teshsuite/gras/small_sleep/CMakeLists.txt
@@ -1,13 +1,23 @@
 cmake_minimum_required(VERSION 2.6)
 
-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_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/_small_sleep_function.c
+                                                       ${CMAKE_CURRENT_BINARY_DIR}/_small_sleep_simulator.c
+                                                       PROPERTIES GENERATED true)
 
-set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/teshsuite/gras/small_sleep/")
+set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_SOURCE_DIR}")
 
-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_executable(small_sleep_function    ${CMAKE_CURRENT_SOURCE_DIR}/small_sleep.c
+                                                                               ${CMAKE_CURRENT_BINARY_DIR}/_small_sleep_function.c)
+add_executable(small_sleep_simulator   ${CMAKE_CURRENT_SOURCE_DIR}/small_sleep.c
+                                                                               ${CMAKE_CURRENT_BINARY_DIR}/_small_sleep_simulator.c)
 
+add_custom_command(
+                                       OUTPUT  ${CMAKE_CURRENT_BINARY_DIR}/_small_sleep_function.c
+                                                       ${CMAKE_CURRENT_BINARY_DIR}/_small_sleep_simulator.c
+                                       DEPENDS gras_stub_generator ${CMAKE_CURRENT_SOURCE_DIR}/small_sleep.xml
+                                       COMMAND ${CMAKE_BINARY_DIR}/bin/gras_stub_generator small_sleep ${CMAKE_CURRENT_SOURCE_DIR}/small_sleep.xml
+                                       )
+                                       
 ### Add definitions for compile
 target_link_libraries(small_sleep_simulator simgrid m pthread -fprofile-arcs)
 target_link_libraries(small_sleep_function gras m pthread -fprofile-arcs)

diff --git a/tools/gras/CMakeLists.txt b/tools/gras/CMakeLists.txt
index fc4cfc5..d9862fc 100644 (file)
--- a/tools/gras/CMakeLists.txt
+++ b/tools/gras/CMakeLists.txt
@@ -3,104 +3,4 @@ cmake_minimum_required(VERSION 2.6)
 add_executable(gras_stub_generator stub_generator.c unix_stub_generator.c windows_stub_generator.c)
 
 ### Add definitions for compile
-target_link_libraries(gras_stub_generator simgrid pthread m -fprofile-arcs)
-
-### make files after the build
-#spawn
-add_custom_command(TARGET gras_stub_generator
-POST_BUILD
-COMMAND ${CMAKE_BINARY_DIR}/bin/gras_stub_generator 
-ARGS --extra-process=child spawn ${PROJECT_DIRECTORY}/examples/gras/spawn/spawn.xml
-WORKING_DIRECTORY "${PROJECT_DIRECTORY}/examples/gras/spawn"
-)
-#timer
-add_custom_command(TARGET gras_stub_generator
-POST_BUILD
-COMMAND ${CMAKE_BINARY_DIR}/bin/gras_stub_generator 
-ARGS timer ${PROJECT_DIRECTORY}/examples/gras/timer/timer.xml
-WORKING_DIRECTORY "${PROJECT_DIRECTORY}/examples/gras/timer"
-)
-#chrono
-add_custom_command(TARGET gras_stub_generator
-POST_BUILD
-COMMAND ${CMAKE_BINARY_DIR}/bin/gras_stub_generator 
-ARGS chrono ${PROJECT_DIRECTORY}/examples/gras/chrono/chrono.xml
-WORKING_DIRECTORY "${PROJECT_DIRECTORY}/examples/gras/chrono"
-)
-#simple_token
-add_custom_command(TARGET gras_stub_generator
-POST_BUILD
-COMMAND ${CMAKE_BINARY_DIR}/bin/gras_stub_generator 
-ARGS simple_token ${PROJECT_DIRECTORY}/examples/gras/mutual_exclusion/simple_token/simple_token.xml
-WORKING_DIRECTORY "${PROJECT_DIRECTORY}/examples/gras/mutual_exclusion/simple_token"
-)
-#mmrpc
-add_custom_command(TARGET gras_stub_generator
-POST_BUILD
-COMMAND ${CMAKE_BINARY_DIR}/bin/gras_stub_generator 
-ARGS mmrpc ${PROJECT_DIRECTORY}/examples/gras/mmrpc/mmrpc.xml
-WORKING_DIRECTORY "${PROJECT_DIRECTORY}/examples/gras/mmrpc"
-)
-#all2all
-add_custom_command(TARGET gras_stub_generator
-POST_BUILD
-COMMAND ${CMAKE_BINARY_DIR}/bin/gras_stub_generator 
-ARGS all2all ${PROJECT_DIRECTORY}/examples/gras/all2all/all2all.xml
-WORKING_DIRECTORY "${PROJECT_DIRECTORY}/examples/gras/all2all"
-)
-#pmm
-add_custom_command(TARGET gras_stub_generator
-POST_BUILD
-COMMAND ${CMAKE_BINARY_DIR}/bin/gras_stub_generator 
-ARGS pmm ${PROJECT_DIRECTORY}/examples/gras/pmm/pmm.xml
-WORKING_DIRECTORY "${PROJECT_DIRECTORY}/examples/gras/pmm"
-)
-#synchro
-add_custom_command(TARGET gras_stub_generator
-POST_BUILD
-COMMAND ${CMAKE_BINARY_DIR}/bin/gras_stub_generator 
-ARGS synchro ${PROJECT_DIRECTORY}/examples/gras/synchro/synchro.xml
-WORKING_DIRECTORY "${PROJECT_DIRECTORY}/examples/gras/synchro"
-)
-#properties
-add_custom_command(TARGET gras_stub_generator
-POST_BUILD
-COMMAND ${CMAKE_BINARY_DIR}/bin/gras_stub_generator 
-ARGS properties ${PROJECT_DIRECTORY}/examples/gras/properties/properties.xml
-WORKING_DIRECTORY "${PROJECT_DIRECTORY}/examples/gras/properties"
-)
-#teshsuite/gras/msg_handle
-add_custom_command(TARGET gras_stub_generator
-POST_BUILD
-COMMAND ${CMAKE_BINARY_DIR}/bin/gras_stub_generator 
-ARGS msg_handle ${PROJECT_DIRECTORY}/teshsuite/gras/msg_handle/msg_handle.xml
-WORKING_DIRECTORY "${PROJECT_DIRECTORY}/teshsuite/gras/msg_handle"
-)
-#teshsuite/gras/empty_main
-add_custom_command(TARGET gras_stub_generator
-POST_BUILD
-COMMAND ${CMAKE_BINARY_DIR}/bin/gras_stub_generator 
-ARGS empty_main ${PROJECT_DIRECTORY}/teshsuite/gras/empty_main/empty_main.xml
-WORKING_DIRECTORY "${PROJECT_DIRECTORY}/teshsuite/gras/empty_main"
-)
-#teshsuite/gras/small_sleep
-add_custom_command(TARGET gras_stub_generator
-POST_BUILD
-COMMAND ${CMAKE_BINARY_DIR}/bin/gras_stub_generator 
-ARGS small_sleep ${PROJECT_DIRECTORY}/teshsuite/gras/small_sleep/small_sleep.xml
-WORKING_DIRECTORY "${PROJECT_DIRECTORY}/teshsuite/gras/small_sleep"
-)
-#examples/amok/bandwidth
-add_custom_command(TARGET gras_stub_generator
-POST_BUILD
-COMMAND ${CMAKE_BINARY_DIR}/bin/gras_stub_generator 
-ARGS bandwidth ${PROJECT_DIRECTORY}/examples/amok/bandwidth/bandwidth.xml
-WORKING_DIRECTORY "${PROJECT_DIRECTORY}/examples/amok/bandwidth"
-)
-#examples/amok/saturate
-add_custom_command(TARGET gras_stub_generator
-POST_BUILD
-COMMAND ${CMAKE_BINARY_DIR}/bin/gras_stub_generator 
-ARGS saturate ${PROJECT_DIRECTORY}/examples/amok/saturate/saturate.xml
-WORKING_DIRECTORY "${PROJECT_DIRECTORY}/examples/amok/saturate"
-)
+target_link_libraries(gras_stub_generator simgrid pthread m -fprofile-arcs)
\ No newline at end of file