From: navarrop Date: Wed, 14 Apr 2010 17:52:52 +0000 (+0000) Subject: Second commit for cmake in an other directory. X-Git-Tag: SVN~166 X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/1d3bb007d52c72d2f2fd5a636d4792d4e5f9427d Second commit for cmake in an other directory. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7575 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- diff --git a/examples/amok/bandwidth/CMakeLists.txt b/examples/amok/bandwidth/CMakeLists.txt index f99521c52a..fa2e267650 100644 --- a/examples/amok/bandwidth/CMakeLists.txt +++ b/examples/amok/bandwidth/CMakeLists.txt @@ -3,8 +3,7 @@ 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(EXECUTABLE_OUTPUT_PATH "./") -set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") +set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/examples/amok/bandwidth/") 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) diff --git a/examples/amok/saturate/CMakeLists.txt b/examples/amok/saturate/CMakeLists.txt index f2300813b6..f33b9efc3d 100644 --- a/examples/amok/saturate/CMakeLists.txt +++ b/examples/amok/saturate/CMakeLists.txt @@ -3,8 +3,7 @@ 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(EXECUTABLE_OUTPUT_PATH "./") -set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") +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) diff --git a/examples/gras/all2all/CMakeLists.txt b/examples/gras/all2all/CMakeLists.txt index ab381cc547..da0650cbb0 100644 --- a/examples/gras/all2all/CMakeLists.txt +++ b/examples/gras/all2all/CMakeLists.txt @@ -3,8 +3,7 @@ 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(EXECUTABLE_OUTPUT_PATH "./") -set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") +set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/examples/gras/all2all/") 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) diff --git a/examples/gras/chrono/CMakeLists.txt b/examples/gras/chrono/CMakeLists.txt index faea4e8806..5c4b379284 100644 --- a/examples/gras/chrono/CMakeLists.txt +++ b/examples/gras/chrono/CMakeLists.txt @@ -3,8 +3,7 @@ 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(EXECUTABLE_OUTPUT_PATH "./") -set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") +set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/examples/gras/chrono/") 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) diff --git a/examples/gras/mmrpc/CMakeLists.txt b/examples/gras/mmrpc/CMakeLists.txt index 87e8a9798a..7632bb6cac 100644 --- a/examples/gras/mmrpc/CMakeLists.txt +++ b/examples/gras/mmrpc/CMakeLists.txt @@ -3,8 +3,7 @@ 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(EXECUTABLE_OUTPUT_PATH "./") -set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") +set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/examples/gras/mmrpc/") 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) diff --git a/examples/gras/mutual_exclusion/simple_token/CMakeLists.txt b/examples/gras/mutual_exclusion/simple_token/CMakeLists.txt index 8979bd23f2..39e99c09e0 100644 --- a/examples/gras/mutual_exclusion/simple_token/CMakeLists.txt +++ b/examples/gras/mutual_exclusion/simple_token/CMakeLists.txt @@ -3,8 +3,7 @@ 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(EXECUTABLE_OUTPUT_PATH "./") -set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") +set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/examples/gras/mutual_exclusion/simple_token/") 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) diff --git a/examples/gras/ping/CMakeLists.txt b/examples/gras/ping/CMakeLists.txt index f100b25c0d..edd207bc05 100644 --- a/examples/gras/ping/CMakeLists.txt +++ b/examples/gras/ping/CMakeLists.txt @@ -3,8 +3,7 @@ cmake_minimum_required(VERSION 2.6) 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") +set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/examples/gras/ping/") 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) diff --git a/examples/gras/pmm/CMakeLists.txt b/examples/gras/pmm/CMakeLists.txt index 1398b2aecb..cfc9d9258c 100644 --- a/examples/gras/pmm/CMakeLists.txt +++ b/examples/gras/pmm/CMakeLists.txt @@ -3,8 +3,7 @@ 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(EXECUTABLE_OUTPUT_PATH "./") -set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") +set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/examples/gras/pmm/") 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) diff --git a/examples/gras/properties/CMakeLists.txt b/examples/gras/properties/CMakeLists.txt index 020d138179..e1ce89ddb0 100644 --- a/examples/gras/properties/CMakeLists.txt +++ b/examples/gras/properties/CMakeLists.txt @@ -3,8 +3,7 @@ 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(EXECUTABLE_OUTPUT_PATH "./") -set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") +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) diff --git a/examples/gras/rpc/CMakeLists.txt b/examples/gras/rpc/CMakeLists.txt index fd1d4a5254..558ff91423 100644 --- a/examples/gras/rpc/CMakeLists.txt +++ b/examples/gras/rpc/CMakeLists.txt @@ -3,8 +3,7 @@ cmake_minimum_required(VERSION 2.6) 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") +set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/examples/gras/rpc/") 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) diff --git a/examples/gras/spawn/CMakeLists.txt b/examples/gras/spawn/CMakeLists.txt index 65af6fe1f0..44b9f4b7ec 100644 --- a/examples/gras/spawn/CMakeLists.txt +++ b/examples/gras/spawn/CMakeLists.txt @@ -3,8 +3,7 @@ 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(EXECUTABLE_OUTPUT_PATH "./") -set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") +set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/examples/gras/spawn/") 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) diff --git a/examples/gras/synchro/CMakeLists.txt b/examples/gras/synchro/CMakeLists.txt index d346ac9186..4b56ca6a7e 100644 --- a/examples/gras/synchro/CMakeLists.txt +++ b/examples/gras/synchro/CMakeLists.txt @@ -3,8 +3,7 @@ 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(EXECUTABLE_OUTPUT_PATH "./") -set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") +set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/examples/gras/synchro/") 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) diff --git a/examples/gras/timer/CMakeLists.txt b/examples/gras/timer/CMakeLists.txt index d328721a6d..7b46583f36 100644 --- a/examples/gras/timer/CMakeLists.txt +++ b/examples/gras/timer/CMakeLists.txt @@ -3,8 +3,7 @@ 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(EXECUTABLE_OUTPUT_PATH "./") -set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") +set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/examples/gras/timer/") 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) diff --git a/examples/msg/actions/CMakeLists.txt b/examples/msg/actions/CMakeLists.txt index 5272da6aca..31c51a6188 100644 --- a/examples/msg/actions/CMakeLists.txt +++ b/examples/msg/actions/CMakeLists.txt @@ -1,7 +1,6 @@ cmake_minimum_required(VERSION 2.6) -set(EXECUTABLE_OUTPUT_PATH "./") -set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") +set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/examples/msg/actions/") add_executable(actions actions.c) diff --git a/examples/msg/gtnets/CMakeLists.txt b/examples/msg/gtnets/CMakeLists.txt index 5566da8119..3829a73a6f 100644 --- a/examples/msg/gtnets/CMakeLists.txt +++ b/examples/msg/gtnets/CMakeLists.txt @@ -1,7 +1,6 @@ cmake_minimum_required(VERSION 2.6) -set(EXECUTABLE_OUTPUT_PATH "./") -set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") +set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/examples/msg/gtnets/") add_executable(gtnets "gtnets.c") diff --git a/examples/msg/masterslave/CMakeLists.txt b/examples/msg/masterslave/CMakeLists.txt index 09e8a3b044..01789bbad0 100644 --- a/examples/msg/masterslave/CMakeLists.txt +++ b/examples/msg/masterslave/CMakeLists.txt @@ -1,7 +1,6 @@ cmake_minimum_required(VERSION 2.6) -set(EXECUTABLE_OUTPUT_PATH "./") -set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") +set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/examples/msg/masterslave/") add_executable(masterslave_failure "masterslave_failure.c") add_executable(masterslave_forwarder "masterslave_forwarder.c") diff --git a/examples/msg/migration/CMakeLists.txt b/examples/msg/migration/CMakeLists.txt index 28ba312aa5..5335fa795a 100644 --- a/examples/msg/migration/CMakeLists.txt +++ b/examples/msg/migration/CMakeLists.txt @@ -1,7 +1,6 @@ cmake_minimum_required(VERSION 2.6) -set(EXECUTABLE_OUTPUT_PATH "./") -set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") +set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/examples/msg/migration/") add_executable(migration migration.c) diff --git a/examples/msg/parallel_task/CMakeLists.txt b/examples/msg/parallel_task/CMakeLists.txt index bb8d71a281..47ea0de305 100644 --- a/examples/msg/parallel_task/CMakeLists.txt +++ b/examples/msg/parallel_task/CMakeLists.txt @@ -1,7 +1,6 @@ cmake_minimum_required(VERSION 2.6) -set(EXECUTABLE_OUTPUT_PATH "./") -set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") +set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/examples/msg/parallel_task/") 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 0f1faef010..dcff70f295 100644 --- a/examples/msg/priority/CMakeLists.txt +++ b/examples/msg/priority/CMakeLists.txt @@ -1,7 +1,6 @@ cmake_minimum_required(VERSION 2.6) -set(EXECUTABLE_OUTPUT_PATH "./") -set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") +set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/examples/msg/priority/") add_executable(priority priority.c) diff --git a/examples/msg/properties/CMakeLists.txt b/examples/msg/properties/CMakeLists.txt index 0cb82e328e..15df2aa541 100644 --- a/examples/msg/properties/CMakeLists.txt +++ b/examples/msg/properties/CMakeLists.txt @@ -1,7 +1,6 @@ cmake_minimum_required(VERSION 2.6) -set(EXECUTABLE_OUTPUT_PATH "./") -set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") +set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/examples/msg/properties/") add_executable(msg_prop msg_prop.c) diff --git a/examples/msg/sendrecv/CMakeLists.txt b/examples/msg/sendrecv/CMakeLists.txt index 1f93a21376..9e9aa9b35b 100644 --- a/examples/msg/sendrecv/CMakeLists.txt +++ b/examples/msg/sendrecv/CMakeLists.txt @@ -1,7 +1,6 @@ cmake_minimum_required(VERSION 2.6) -set(EXECUTABLE_OUTPUT_PATH "./") -set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") +set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/examples/msg/sendrecv/") add_executable(sendrecv sendrecv.c) diff --git a/examples/msg/suspend/CMakeLists.txt b/examples/msg/suspend/CMakeLists.txt index 1e19a896bd..f23cfe0d11 100644 --- a/examples/msg/suspend/CMakeLists.txt +++ b/examples/msg/suspend/CMakeLists.txt @@ -1,7 +1,6 @@ cmake_minimum_required(VERSION 2.6) -set(EXECUTABLE_OUTPUT_PATH "./") -set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") +set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/examples/msg/suspend/") add_executable(suspend suspend.c) diff --git a/examples/msg/trace/CMakeLists.txt b/examples/msg/trace/CMakeLists.txt index e801bf02b9..f42d4d53c0 100644 --- a/examples/msg/trace/CMakeLists.txt +++ b/examples/msg/trace/CMakeLists.txt @@ -1,7 +1,6 @@ cmake_minimum_required(VERSION 2.6) -set(EXECUTABLE_OUTPUT_PATH "./") -set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") +set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/examples/msg/trace/") add_executable(test_trace_integration test_trace_integration.c) diff --git a/examples/simdag/CMakeLists.txt b/examples/simdag/CMakeLists.txt index 4a87805883..b4d9866562 100644 --- a/examples/simdag/CMakeLists.txt +++ b/examples/simdag/CMakeLists.txt @@ -1,7 +1,6 @@ cmake_minimum_required(VERSION 2.6) set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/examples/simdag/") -set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") add_executable(ex_sd_test sd_test.c) add_executable(ex_sd_test2 sd_test2.c) diff --git a/examples/simdag/dax/CMakeLists.txt b/examples/simdag/dax/CMakeLists.txt index 49e8442f59..f61f67f104 100644 --- a/examples/simdag/dax/CMakeLists.txt +++ b/examples/simdag/dax/CMakeLists.txt @@ -1,7 +1,6 @@ cmake_minimum_required(VERSION 2.6) -set(EXECUTABLE_OUTPUT_PATH "./") -set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") +set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/examples/simdag/dax/") add_executable(dax_test dax_test.c) diff --git a/examples/simdag/metaxml/CMakeLists.txt b/examples/simdag/metaxml/CMakeLists.txt index d3a327e82e..39b01cf15e 100644 --- a/examples/simdag/metaxml/CMakeLists.txt +++ b/examples/simdag/metaxml/CMakeLists.txt @@ -1,7 +1,6 @@ cmake_minimum_required(VERSION 2.6) -set(EXECUTABLE_OUTPUT_PATH "./") -set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") +set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/examples/simdag/metaxml/") add_executable(sd_meta sd_meta.c) diff --git a/examples/simdag/properties/CMakeLists.txt b/examples/simdag/properties/CMakeLists.txt index 8fb5c6f551..c7e8e180ad 100644 --- a/examples/simdag/properties/CMakeLists.txt +++ b/examples/simdag/properties/CMakeLists.txt @@ -1,7 +1,6 @@ cmake_minimum_required(VERSION 2.6) -set(EXECUTABLE_OUTPUT_PATH "./") -set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") +set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/examples/simdag/properties/") add_executable(sd_prop sd_prop.c) diff --git a/examples/smpi/CMakeLists.txt b/examples/smpi/CMakeLists.txt index 71e8a5e5b3..368093be63 100644 --- a/examples/smpi/CMakeLists.txt +++ b/examples/smpi/CMakeLists.txt @@ -2,8 +2,7 @@ cmake_minimum_required(VERSION 2.6) set(CMAKE_C_COMPILER "${PROJECT_DIRECTORY}/src/smpi/smpicc") -set(EXECUTABLE_OUTPUT_PATH "./") -set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") +set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/examples/smpi/") set(flags "-Dmain=smpi_simulated_main") set(INCLUDES_bis "-I${PROJECT_DIRECTORY}/include/smpi") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index fcaf96b4be..f0cdf8744b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,5 +1,6 @@ cmake_minimum_required(VERSION 2.6) +set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/src/") set(USE_TEST_UNITS "${PROJECT_DIRECTORY}/src/simgrid_units_main.c") foreach(file ${TEST_UNITS}) diff --git a/teshsuite/gras/datadesc/CMakeLists.txt b/teshsuite/gras/datadesc/CMakeLists.txt index 854af4e3d6..e154e2e569 100644 --- a/teshsuite/gras/datadesc/CMakeLists.txt +++ b/teshsuite/gras/datadesc/CMakeLists.txt @@ -1,7 +1,6 @@ cmake_minimum_required(VERSION 2.6) -set(EXECUTABLE_OUTPUT_PATH "./") -set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") +set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/teshsuite/gras/datadesc/") add_executable(datadesc_usage datadesc_usage.c datadesc_structs.c) diff --git a/teshsuite/gras/empty_main/CMakeLists.txt b/teshsuite/gras/empty_main/CMakeLists.txt index 2671a9fc9e..e86114cdef 100644 --- a/teshsuite/gras/empty_main/CMakeLists.txt +++ b/teshsuite/gras/empty_main/CMakeLists.txt @@ -3,8 +3,7 @@ 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(EXECUTABLE_OUTPUT_PATH "./") -set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") +set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/teshsuite/gras/empty_main/") 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) diff --git a/teshsuite/gras/msg_handle/CMakeLists.txt b/teshsuite/gras/msg_handle/CMakeLists.txt index 61c3edb3cc..19de8c8a91 100644 --- a/teshsuite/gras/msg_handle/CMakeLists.txt +++ b/teshsuite/gras/msg_handle/CMakeLists.txt @@ -3,8 +3,7 @@ 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(EXECUTABLE_OUTPUT_PATH "./") -set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") +set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/teshsuite/gras/msg_handle/") 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) diff --git a/teshsuite/gras/small_sleep/CMakeLists.txt b/teshsuite/gras/small_sleep/CMakeLists.txt index 2eab97e943..07afff7dac 100644 --- a/teshsuite/gras/small_sleep/CMakeLists.txt +++ b/teshsuite/gras/small_sleep/CMakeLists.txt @@ -3,8 +3,7 @@ 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(EXECUTABLE_OUTPUT_PATH "./") -set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") +set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/teshsuite/gras/small_sleep/") 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) diff --git a/teshsuite/simdag/CMakeLists.txt b/teshsuite/simdag/CMakeLists.txt index 55365c0f68..73e97a3c3a 100644 --- a/teshsuite/simdag/CMakeLists.txt +++ b/teshsuite/simdag/CMakeLists.txt @@ -1,7 +1,6 @@ cmake_minimum_required(VERSION 2.6) -set(EXECUTABLE_OUTPUT_PATH "./") -set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") +set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/teshsuite/simdag/") add_executable(basic0 basic0.c) add_executable(basic1 basic1.c) diff --git a/teshsuite/simdag/network/CMakeLists.txt b/teshsuite/simdag/network/CMakeLists.txt index f65cb8fc7a..948752fc83 100644 --- a/teshsuite/simdag/network/CMakeLists.txt +++ b/teshsuite/simdag/network/CMakeLists.txt @@ -1,7 +1,6 @@ cmake_minimum_required(VERSION 2.6) -set(EXECUTABLE_OUTPUT_PATH "./") -set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") +set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/teshsuite/simdag/network/") add_executable(test_reinit_costs test_reinit_costs.c) diff --git a/teshsuite/simdag/network/mxn/CMakeLists.txt b/teshsuite/simdag/network/mxn/CMakeLists.txt index 02e17554db..7740c9f2f3 100644 --- a/teshsuite/simdag/network/mxn/CMakeLists.txt +++ b/teshsuite/simdag/network/mxn/CMakeLists.txt @@ -1,7 +1,6 @@ cmake_minimum_required(VERSION 2.6) -set(EXECUTABLE_OUTPUT_PATH "./") -set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") +set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/teshsuite/simdag/network/mxn/") add_executable(test_intra_all2all test_intra_all2all.c) add_executable(test_intra_independent_comm test_intra_independent_comm.c) diff --git a/teshsuite/simdag/network/p2p/CMakeLists.txt b/teshsuite/simdag/network/p2p/CMakeLists.txt index bdad24380c..228253f9a5 100644 --- a/teshsuite/simdag/network/p2p/CMakeLists.txt +++ b/teshsuite/simdag/network/p2p/CMakeLists.txt @@ -1,7 +1,6 @@ cmake_minimum_required(VERSION 2.6) -set(EXECUTABLE_OUTPUT_PATH "./") -set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") +set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/teshsuite/simdag/network/p2p/") add_executable(test_latency1 test_latency1.c) add_executable(test_latency2 test_latency2.c) diff --git a/teshsuite/simdag/partask/CMakeLists.txt b/teshsuite/simdag/partask/CMakeLists.txt index 7c66c581fe..1ffb156556 100644 --- a/teshsuite/simdag/partask/CMakeLists.txt +++ b/teshsuite/simdag/partask/CMakeLists.txt @@ -1,7 +1,6 @@ cmake_minimum_required(VERSION 2.6) -set(EXECUTABLE_OUTPUT_PATH "./") -set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") +set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/teshsuite/simdag/partask/") add_executable(test_comp_only_seq test_comp_only_seq.c) add_executable(test_comp_only_par test_comp_only_par.c) diff --git a/teshsuite/simdag/platforms/CMakeLists.txt b/teshsuite/simdag/platforms/CMakeLists.txt index 9afac45eb3..5a281ee6af 100644 --- a/teshsuite/simdag/platforms/CMakeLists.txt +++ b/teshsuite/simdag/platforms/CMakeLists.txt @@ -1,7 +1,6 @@ cmake_minimum_required(VERSION 2.6) -set(EXECUTABLE_OUTPUT_PATH "./") -set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") +set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/") add_executable(basic_parsing_test basic_parsing_test.c) add_executable(flatifier flatifier.c) diff --git a/teshsuite/xbt/CMakeLists.txt b/teshsuite/xbt/CMakeLists.txt index 2349d4965a..79271514fb 100644 --- a/teshsuite/xbt/CMakeLists.txt +++ b/teshsuite/xbt/CMakeLists.txt @@ -1,7 +1,6 @@ cmake_minimum_required(VERSION 2.6) -set(EXECUTABLE_OUTPUT_PATH "./") -set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") +set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/teshsuite/xbt/") add_executable(log_large_test log_large_test.c) add_executable(parallel_log_crashtest parallel_log_crashtest.c) diff --git a/testsuite/simdag/CMakeLists.txt b/testsuite/simdag/CMakeLists.txt index 3449d064a6..92d2e66204 100644 --- a/testsuite/simdag/CMakeLists.txt +++ b/testsuite/simdag/CMakeLists.txt @@ -1,7 +1,6 @@ cmake_minimum_required(VERSION 2.6) -set(EXECUTABLE_OUTPUT_PATH "./") -set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") +set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/testsuite/simdag/") add_executable(sd_test sd_test.c) diff --git a/testsuite/surf/CMakeLists.txt b/testsuite/surf/CMakeLists.txt index c2abf460d8..6a60df67e5 100644 --- a/testsuite/surf/CMakeLists.txt +++ b/testsuite/surf/CMakeLists.txt @@ -1,7 +1,6 @@ cmake_minimum_required(VERSION 2.6) -set(EXECUTABLE_OUTPUT_PATH "./") -set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") +set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/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 f95dbb6ece..cd690a1f6d 100644 --- a/testsuite/xbt/CMakeLists.txt +++ b/testsuite/xbt/CMakeLists.txt @@ -1,7 +1,6 @@ cmake_minimum_required(VERSION 2.6) -set(EXECUTABLE_OUTPUT_PATH "./") -set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") +set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/testsuite/xbt/") add_executable(log_usage "log_usage.c") add_executable(graphxml_usage "graphxml_usage.c") diff --git a/tools/gras/CMakeLists.txt b/tools/gras/CMakeLists.txt index 31ee6e7ff5..6f5604d900 100644 --- a/tools/gras/CMakeLists.txt +++ b/tools/gras/CMakeLists.txt @@ -1,7 +1,6 @@ cmake_minimum_required(VERSION 2.6) -set(EXECUTABLE_OUTPUT_PATH "./") -set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") +set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/tools/gras/") add_executable(gras_stub_generator stub_generator.c unix_stub_generator.c windows_stub_generator.c) diff --git a/tools/tesh/CMakeLists.txt b/tools/tesh/CMakeLists.txt index 42b917e85d..579f885a6c 100644 --- a/tools/tesh/CMakeLists.txt +++ b/tools/tesh/CMakeLists.txt @@ -1,7 +1,6 @@ cmake_minimum_required(VERSION 2.6) -set(EXECUTABLE_OUTPUT_PATH "./") -set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") +set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/tools/tesh/") add_executable(tesh tesh.c run_context.c signal.c)