From dc7bcc75749ca6fe24da694e8ab8682af0f67149 Mon Sep 17 00:00:00 2001 From: mquinson Date: Sun, 28 Nov 2010 21:07:44 +0000 Subject: [PATCH] Allow out of source builds git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8717 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- examples/amok/bandwidth/CMakeLists.txt | 2 +- examples/amok/saturate/CMakeLists.txt | 2 +- examples/gras/all2all/CMakeLists.txt | 2 +- examples/gras/chrono/CMakeLists.txt | 2 +- examples/gras/console/CMakeLists.txt | 2 +- examples/gras/mmrpc/CMakeLists.txt | 2 +- .../mutual_exclusion/simple_token/CMakeLists.txt | 2 +- examples/gras/ping/CMakeLists.txt | 2 +- examples/gras/pmm/CMakeLists.txt | 2 +- examples/gras/properties/CMakeLists.txt | 2 +- examples/gras/rpc/CMakeLists.txt | 2 +- examples/gras/spawn/CMakeLists.txt | 2 +- examples/gras/synchro/CMakeLists.txt | 2 +- examples/gras/timer/CMakeLists.txt | 2 +- examples/msg/actions/CMakeLists.txt | 2 +- examples/msg/gtnets/CMakeLists.txt | 2 +- examples/msg/icomms/CMakeLists.txt | 2 +- examples/msg/masterslave/CMakeLists.txt | 2 +- examples/msg/mc/CMakeLists.txt | 2 +- examples/msg/migration/CMakeLists.txt | 2 +- examples/msg/parallel_task/CMakeLists.txt | 2 +- examples/msg/priority/CMakeLists.txt | 2 +- examples/msg/properties/CMakeLists.txt | 2 +- examples/msg/sendrecv/CMakeLists.txt | 2 +- examples/msg/suspend/CMakeLists.txt | 2 +- examples/msg/trace/CMakeLists.txt | 2 +- examples/msg/tracing/CMakeLists.txt | 12 ++++++------ examples/simdag/CMakeLists.txt | 14 +++++++------- examples/simdag/dax/CMakeLists.txt | 2 +- examples/simdag/dot/CMakeLists.txt | 3 +-- examples/simdag/metaxml/CMakeLists.txt | 2 +- examples/simdag/properties/CMakeLists.txt | 2 +- examples/simdag/scheduling/CMakeLists.txt | 2 +- testsuite/simdag/CMakeLists.txt | 2 +- testsuite/surf/CMakeLists.txt | 2 +- testsuite/xbt/CMakeLists.txt | 2 +- 36 files changed, 47 insertions(+), 48 deletions(-) diff --git a/examples/amok/bandwidth/CMakeLists.txt b/examples/amok/bandwidth/CMakeLists.txt index c9246cf7ab..61f0935d70 100644 --- a/examples/amok/bandwidth/CMakeLists.txt +++ b/examples/amok/bandwidth/CMakeLists.txt @@ -5,7 +5,7 @@ set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/_bandwidth_simulator.c ${CMAKE_CURRENT_BINARY_DIR}/_bandwidth_sensor.c PROPERTIES GENERATED true) -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_SOURCE_DIR}") +set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") add_executable(bandwidth_simulator ${CMAKE_CURRENT_BINARY_DIR}/_bandwidth_simulator.c ${CMAKE_CURRENT_SOURCE_DIR}/bandwidth.c) diff --git a/examples/amok/saturate/CMakeLists.txt b/examples/amok/saturate/CMakeLists.txt index 910c328b67..b68ff9ac2c 100644 --- a/examples/amok/saturate/CMakeLists.txt +++ b/examples/amok/saturate/CMakeLists.txt @@ -5,7 +5,7 @@ set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/_saturate_simulator.c ${CMAKE_CURRENT_BINARY_DIR}/_saturate_sensor.c PROPERTIES GENERATED true) -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_SOURCE_DIR}") +set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") add_executable(saturate_simulator ${CMAKE_CURRENT_BINARY_DIR}/_saturate_simulator.c ${CMAKE_CURRENT_SOURCE_DIR}/saturate.c) diff --git a/examples/gras/all2all/CMakeLists.txt b/examples/gras/all2all/CMakeLists.txt index 06ea845702..ff56104bb8 100644 --- a/examples/gras/all2all/CMakeLists.txt +++ b/examples/gras/all2all/CMakeLists.txt @@ -5,7 +5,7 @@ set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/_all2all_simulator.c ${CMAKE_CURRENT_BINARY_DIR}/_all2all_receiver.c PROPERTIES GENERATED true) -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_SOURCE_DIR}") +set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") add_executable(all2all_simulator ${CMAKE_CURRENT_BINARY_DIR}/_all2all_simulator.c ${CMAKE_CURRENT_SOURCE_DIR}/all2all.c) diff --git a/examples/gras/chrono/CMakeLists.txt b/examples/gras/chrono/CMakeLists.txt index 1971a7cdba..da9e0ac9c6 100644 --- a/examples/gras/chrono/CMakeLists.txt +++ b/examples/gras/chrono/CMakeLists.txt @@ -4,7 +4,7 @@ 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 "${CMAKE_CURRENT_SOURCE_DIR}") +set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") add_executable(chrono_simulator ${CMAKE_CURRENT_BINARY_DIR}/_chrono_simulator.c ${CMAKE_CURRENT_SOURCE_DIR}/chrono.c) diff --git a/examples/gras/console/CMakeLists.txt b/examples/gras/console/CMakeLists.txt index 8ebaf02e14..6e7a215b7c 100644 --- a/examples/gras/console/CMakeLists.txt +++ b/examples/gras/console/CMakeLists.txt @@ -6,7 +6,7 @@ set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/_ping_simulator.c ${CMAKE_CURRENT_SOURCE_DIR}/_ping_server.c PROPERTIES GENERATED true) -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_SOURCE_DIR}") +set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") add_executable(ping_simulator_console ${CMAKE_CURRENT_SOURCE_DIR}/_ping_simulator.c ${CMAKE_CURRENT_SOURCE_DIR}/ping_server.c diff --git a/examples/gras/mmrpc/CMakeLists.txt b/examples/gras/mmrpc/CMakeLists.txt index 56119abcb2..431dd08b06 100644 --- a/examples/gras/mmrpc/CMakeLists.txt +++ b/examples/gras/mmrpc/CMakeLists.txt @@ -5,7 +5,7 @@ set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/_mmrpc_simulator.c ${CMAKE_CURRENT_BINARY_DIR}/_mmrpc_server.c PROPERTIES GENERATED true) -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_SOURCE_DIR}") +set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") add_executable(mmrpc_simulator ${CMAKE_CURRENT_BINARY_DIR}/_mmrpc_simulator.c ${CMAKE_CURRENT_SOURCE_DIR}/mmrpc_common.c diff --git a/examples/gras/mutual_exclusion/simple_token/CMakeLists.txt b/examples/gras/mutual_exclusion/simple_token/CMakeLists.txt index 71985fece6..926a8e9576 100644 --- a/examples/gras/mutual_exclusion/simple_token/CMakeLists.txt +++ b/examples/gras/mutual_exclusion/simple_token/CMakeLists.txt @@ -4,7 +4,7 @@ set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/_simple_token_simulator. ${CMAKE_CURRENT_BINARY_DIR}/_simple_token_node.c PROPERTIES GENERATED true) -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_SOURCE_DIR}") +set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") add_executable(simple_token_simulator ${CMAKE_CURRENT_BINARY_DIR}/_simple_token_simulator.c ${CMAKE_CURRENT_SOURCE_DIR}/simple_token.c) diff --git a/examples/gras/ping/CMakeLists.txt b/examples/gras/ping/CMakeLists.txt index 7557a3174d..f01ec2a6ca 100644 --- a/examples/gras/ping/CMakeLists.txt +++ b/examples/gras/ping/CMakeLists.txt @@ -5,7 +5,7 @@ set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/_ping_simulator.c ${CMAKE_CURRENT_BINARY_DIR}/_ping_server.c PROPERTIES GENERATED true) -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_SOURCE_DIR}") +set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") add_executable(ping_simulator ${CMAKE_CURRENT_BINARY_DIR}/_ping_simulator.c ${CMAKE_CURRENT_SOURCE_DIR}/ping_server.c diff --git a/examples/gras/pmm/CMakeLists.txt b/examples/gras/pmm/CMakeLists.txt index 9048fd2484..eee153f14d 100644 --- a/examples/gras/pmm/CMakeLists.txt +++ b/examples/gras/pmm/CMakeLists.txt @@ -5,7 +5,7 @@ set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/_pmm_simulator.c ${CMAKE_CURRENT_BINARY_DIR}/_pmm_master.c PROPERTIES GENERATED true) -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_SOURCE_DIR}") +set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") add_executable(pmm_simulator ${CMAKE_CURRENT_BINARY_DIR}/_pmm_simulator.c ${CMAKE_CURRENT_SOURCE_DIR}/pmm.c) diff --git a/examples/gras/properties/CMakeLists.txt b/examples/gras/properties/CMakeLists.txt index 8435d426ad..111947cd92 100644 --- a/examples/gras/properties/CMakeLists.txt +++ b/examples/gras/properties/CMakeLists.txt @@ -5,7 +5,7 @@ set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/_properties_simulator.c ${CMAKE_CURRENT_BINARY_DIR}/_properties_bob.c PROPERTIES GENERATED true) -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_SOURCE_DIR}") +set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") add_executable(properties_simulator ${CMAKE_CURRENT_BINARY_DIR}/_properties_simulator.c ${CMAKE_CURRENT_SOURCE_DIR}/properties.c) diff --git a/examples/gras/rpc/CMakeLists.txt b/examples/gras/rpc/CMakeLists.txt index 0a891375a4..5d445ce8fd 100644 --- a/examples/gras/rpc/CMakeLists.txt +++ b/examples/gras/rpc/CMakeLists.txt @@ -6,7 +6,7 @@ set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/_rpc_simulator.c ${CMAKE_CURRENT_BINARY_DIR}/_rpc_server.c PROPERTIES GENERATED true) -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_SOURCE_DIR}") +set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_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) diff --git a/examples/gras/spawn/CMakeLists.txt b/examples/gras/spawn/CMakeLists.txt index f093d21dc9..049002dfeb 100644 --- a/examples/gras/spawn/CMakeLists.txt +++ b/examples/gras/spawn/CMakeLists.txt @@ -4,7 +4,7 @@ set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/_spawn_simulator.c ${CMAKE_CURRENT_BINARY_DIR}/_spawn_server.c PROPERTIES GENERATED true) -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_SOURCE_DIR}") +set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") add_executable(spawn_simulator ${CMAKE_CURRENT_BINARY_DIR}/_spawn_simulator.c ${CMAKE_CURRENT_SOURCE_DIR}/spawn.c) diff --git a/examples/gras/synchro/CMakeLists.txt b/examples/gras/synchro/CMakeLists.txt index 55f848a6b7..e51c64f046 100644 --- a/examples/gras/synchro/CMakeLists.txt +++ b/examples/gras/synchro/CMakeLists.txt @@ -4,7 +4,7 @@ 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 "${CMAKE_CURRENT_SOURCE_DIR}") +set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") add_executable(synchro_simulator ${CMAKE_CURRENT_BINARY_DIR}/_synchro_simulator.c ${CMAKE_CURRENT_SOURCE_DIR}/philosopher.c) diff --git a/examples/gras/timer/CMakeLists.txt b/examples/gras/timer/CMakeLists.txt index 26358443ad..431ee35b7f 100644 --- a/examples/gras/timer/CMakeLists.txt +++ b/examples/gras/timer/CMakeLists.txt @@ -4,7 +4,7 @@ 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 "${CMAKE_CURRENT_SOURCE_DIR}") +set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") add_executable(timer_simulator ${CMAKE_CURRENT_BINARY_DIR}/_timer_simulator.c ${CMAKE_CURRENT_SOURCE_DIR}/timer.c) diff --git a/examples/msg/actions/CMakeLists.txt b/examples/msg/actions/CMakeLists.txt index c5301824b0..db43ddde59 100644 --- a/examples/msg/actions/CMakeLists.txt +++ b/examples/msg/actions/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.6) -set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/examples/msg/actions/") +set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") add_executable(actions actions.c) diff --git a/examples/msg/gtnets/CMakeLists.txt b/examples/msg/gtnets/CMakeLists.txt index c9a36fc64b..709d3cd6de 100644 --- a/examples/msg/gtnets/CMakeLists.txt +++ b/examples/msg/gtnets/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.6) -set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/examples/msg/gtnets/") +set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") add_executable(gtnets "gtnets.c") diff --git a/examples/msg/icomms/CMakeLists.txt b/examples/msg/icomms/CMakeLists.txt index 870bfb40ac..7a628bdefb 100644 --- a/examples/msg/icomms/CMakeLists.txt +++ b/examples/msg/icomms/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.6) -set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/examples/msg/icomms/") +set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") add_executable(peer peer.c) target_link_libraries(peer simgrid) diff --git a/examples/msg/masterslave/CMakeLists.txt b/examples/msg/masterslave/CMakeLists.txt index 1d908ff355..77786c2bb6 100644 --- a/examples/msg/masterslave/CMakeLists.txt +++ b/examples/msg/masterslave/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.6) -set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/examples/msg/masterslave/") +set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") add_executable(masterslave_failure "masterslave_failure.c") add_executable(masterslave_forwarder "masterslave_forwarder.c") diff --git a/examples/msg/mc/CMakeLists.txt b/examples/msg/mc/CMakeLists.txt index 3fab5c94b6..b497e843f4 100644 --- a/examples/msg/mc/CMakeLists.txt +++ b/examples/msg/mc/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.6) -set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/examples/msg/mc/") +set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") add_executable(centralized centralized_mutex.c) add_executable(bugged1 bugged1.c) diff --git a/examples/msg/migration/CMakeLists.txt b/examples/msg/migration/CMakeLists.txt index 52cf64fee3..3c825c608c 100644 --- a/examples/msg/migration/CMakeLists.txt +++ b/examples/msg/migration/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.6) -set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/examples/msg/migration/") +set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") add_executable(migration migration.c) diff --git a/examples/msg/parallel_task/CMakeLists.txt b/examples/msg/parallel_task/CMakeLists.txt index 3170842477..760b58ca24 100644 --- a/examples/msg/parallel_task/CMakeLists.txt +++ b/examples/msg/parallel_task/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.6) -set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/examples/msg/parallel_task/") +set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") add_executable(parallel_task parallel_task.c) add_executable(test_ptask test_ptask.c) diff --git a/examples/msg/priority/CMakeLists.txt b/examples/msg/priority/CMakeLists.txt index a355235a8a..0f9757ff71 100644 --- a/examples/msg/priority/CMakeLists.txt +++ b/examples/msg/priority/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.6) -set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/examples/msg/priority/") +set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") add_executable(priority priority.c) diff --git a/examples/msg/properties/CMakeLists.txt b/examples/msg/properties/CMakeLists.txt index 3a01ad9ace..36aad93ec3 100644 --- a/examples/msg/properties/CMakeLists.txt +++ b/examples/msg/properties/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.6) -set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/examples/msg/properties/") +set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") add_executable(msg_prop msg_prop.c) diff --git a/examples/msg/sendrecv/CMakeLists.txt b/examples/msg/sendrecv/CMakeLists.txt index 3a48e3557c..73ac8874ba 100644 --- a/examples/msg/sendrecv/CMakeLists.txt +++ b/examples/msg/sendrecv/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.6) -set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/examples/msg/sendrecv/") +set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") add_executable(sendrecv sendrecv.c) diff --git a/examples/msg/suspend/CMakeLists.txt b/examples/msg/suspend/CMakeLists.txt index 0f3f43472f..7d4a9e144f 100644 --- a/examples/msg/suspend/CMakeLists.txt +++ b/examples/msg/suspend/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.6) -set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/examples/msg/suspend/") +set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") add_executable(suspend suspend.c) diff --git a/examples/msg/trace/CMakeLists.txt b/examples/msg/trace/CMakeLists.txt index b8c9860e6e..235b9a0264 100644 --- a/examples/msg/trace/CMakeLists.txt +++ b/examples/msg/trace/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.6) -set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/examples/msg/trace/") +set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") add_executable(test_trace_integration test_trace_integration.c) diff --git a/examples/msg/tracing/CMakeLists.txt b/examples/msg/tracing/CMakeLists.txt index 959e01b91a..7a0e9834a6 100644 --- a/examples/msg/tracing/CMakeLists.txt +++ b/examples/msg/tracing/CMakeLists.txt @@ -1,13 +1,13 @@ cmake_minimum_required(VERSION 2.6) -set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/examples/msg/tracing/") +set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") -add_executable(ms ${PROJECT_DIRECTORY}/examples/msg/tracing/ms.c) -add_executable(categories ${PROJECT_DIRECTORY}/examples/msg/tracing/categories.c) -add_executable(volume ${PROJECT_DIRECTORY}/examples/msg/tracing/volume.c) -add_executable(tasks ${PROJECT_DIRECTORY}/examples/msg/tracing/tasks.c) -add_executable(procmig ${PROJECT_DIRECTORY}/examples/msg/tracing/procmig.c) +add_executable(ms ${CMAKE_CURRENT_SOURCE_DIR}/ms.c) +add_executable(categories ${CMAKE_CURRENT_SOURCE_DIR}/categories.c) +add_executable(volume ${CMAKE_CURRENT_SOURCE_DIR}/volume.c) +add_executable(tasks ${CMAKE_CURRENT_SOURCE_DIR}/tasks.c) +add_executable(procmig ${CMAKE_CURRENT_SOURCE_DIR}/procmig.c) ### Add definitions for compile target_link_libraries(ms simgrid m ) diff --git a/examples/simdag/CMakeLists.txt b/examples/simdag/CMakeLists.txt index 56f28b02c4..37ec7d4d92 100644 --- a/examples/simdag/CMakeLists.txt +++ b/examples/simdag/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.6) -set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/examples/simdag/") +set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}/") add_executable(ex_sd_test sd_test.c) add_executable(sd_test2 sd_test2.c) @@ -18,13 +18,13 @@ if(NOT WIN32) add_custom_command(TARGET ex_sd_test POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_DIRECTORY}/examples/simdag/ex_sd_test ${PROJECT_DIRECTORY}/examples/simdag/sd_test - WORKING_DIRECTORY "${PROJECT_DIRECTORY}/examples/simdag/" + COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/ex_sd_test ${CMAKE_CURRENT_BINARY_DIR}/sd_test + WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" ) get_directory_property(extra_clean_files ADDITIONAL_MAKE_CLEAN_FILES) set_directory_properties( PROPERTIES - ADDITIONAL_MAKE_CLEAN_FILES "${extra_clean_files};${PROJECT_DIRECTORY}/examples/simdag/sd_test") + ADDITIONAL_MAKE_CLEAN_FILES "${extra_clean_files};${CMAKE_CURRENT_BINARY_DIR}/sd_test") else(NOT WIN32) target_link_libraries(ex_sd_test simgrid) @@ -35,12 +35,12 @@ else(NOT WIN32) add_custom_command(TARGET ex_sd_test POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_DIRECTORY}/examples/simdag/ex_sd_test.exe ${PROJECT_DIRECTORY}/examples/simdag/sd_test.exe - WORKING_DIRECTORY "${PROJECT_DIRECTORY}/examples/simdag/" + COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/ex_sd_test.exe ${CMAKE_CURRENT_BINARY_DIR}/sd_test.exe + WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" ) get_directory_property(extra_clean_files ADDITIONAL_MAKE_CLEAN_FILES) set_directory_properties( PROPERTIES - ADDITIONAL_MAKE_CLEAN_FILES "${extra_clean_files};${PROJECT_DIRECTORY}/examples/simdag/sd_test.exe") + ADDITIONAL_MAKE_CLEAN_FILES "${extra_clean_files};${CMAKE_CURRENT_BINARY_DIR}/sd_test.exe") endif(NOT WIN32) diff --git a/examples/simdag/dax/CMakeLists.txt b/examples/simdag/dax/CMakeLists.txt index a0880c3c88..cc71e08f46 100644 --- a/examples/simdag/dax/CMakeLists.txt +++ b/examples/simdag/dax/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.6) -set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/examples/simdag/dax/") +set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") add_executable(dax_test dax_test.c) diff --git a/examples/simdag/dot/CMakeLists.txt b/examples/simdag/dot/CMakeLists.txt index c67aa480ca..12bc21689f 100644 --- a/examples/simdag/dot/CMakeLists.txt +++ b/examples/simdag/dot/CMakeLists.txt @@ -1,7 +1,6 @@ cmake_minimum_required(VERSION 2.6) -set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/examples/simdag/dot") -set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") +set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") add_executable(dot_test dot_test.c) #add_executable( ) diff --git a/examples/simdag/metaxml/CMakeLists.txt b/examples/simdag/metaxml/CMakeLists.txt index a59619d69a..ab744c82e9 100644 --- a/examples/simdag/metaxml/CMakeLists.txt +++ b/examples/simdag/metaxml/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.6) -set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/examples/simdag/metaxml/") +set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") add_executable(sd_meta sd_meta.c) diff --git a/examples/simdag/properties/CMakeLists.txt b/examples/simdag/properties/CMakeLists.txt index 4039619341..57f41058df 100644 --- a/examples/simdag/properties/CMakeLists.txt +++ b/examples/simdag/properties/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.6) -set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/examples/simdag/properties/") +set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") add_executable(sd_prop sd_prop.c) diff --git a/examples/simdag/scheduling/CMakeLists.txt b/examples/simdag/scheduling/CMakeLists.txt index 62b2018720..e112e4a4dd 100644 --- a/examples/simdag/scheduling/CMakeLists.txt +++ b/examples/simdag/scheduling/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.6) -set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/examples/simdag/scheduling/") +set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") add_executable(minmin_test minmin_test.c) diff --git a/testsuite/simdag/CMakeLists.txt b/testsuite/simdag/CMakeLists.txt index 972e780350..82696da7b0 100644 --- a/testsuite/simdag/CMakeLists.txt +++ b/testsuite/simdag/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.6) -set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/testsuite/simdag/") +set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}/testsuite/simdag/") add_executable(sd_test sd_test.c) diff --git a/testsuite/surf/CMakeLists.txt b/testsuite/surf/CMakeLists.txt index a6ec710f2f..6b654f306e 100644 --- a/testsuite/surf/CMakeLists.txt +++ b/testsuite/surf/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.6) -set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/testsuite/surf/") +set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}/testsuite/surf/") add_executable(lmm_usage "lmm_usage.c") add_executable(maxmin_bench "maxmin_bench.c") diff --git a/testsuite/xbt/CMakeLists.txt b/testsuite/xbt/CMakeLists.txt index 69a1cdafb9..256baa78e0 100644 --- a/testsuite/xbt/CMakeLists.txt +++ b/testsuite/xbt/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.6) -set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/testsuite/xbt/") +set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}/testsuite/xbt/") add_executable(log_usage "log_usage.c") add_executable(graphxml_usage "graphxml_usage.c") -- 2.20.1