From: navarrop Date: Tue, 30 Nov 2010 14:21:59 +0000 (+0000) Subject: Prepare the out of source build. X-Git-Tag: v3_5~73 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/59e3562d124c515d548481ce42f5ce57fd367b7f Prepare the out of source build. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8758 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- diff --git a/examples/simdag/CMakeLists.txt b/examples/simdag/CMakeLists.txt index 37ec7d4d92..ce683e9204 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 "${CMAKE_CURRENT_BINARY_DIR}/") +set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") add_executable(ex_sd_test sd_test.c) add_executable(sd_test2 sd_test2.c) diff --git a/examples/smpi/CMakeLists.txt b/examples/smpi/CMakeLists.txt index 3b47512525..2fc3bd2a82 100644 --- a/examples/smpi/CMakeLists.txt +++ b/examples/smpi/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.6) set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/bin/smpicc") -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_BINARY_DIR}/examples/smpi/") +set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") set(flags "-Dmain=smpi_simulated_main") set(INCLUDES_bis "-I${PROJECT_DIRECTORY}/include/smpi") diff --git a/teshsuite/gras/datadesc/CMakeLists.txt b/teshsuite/gras/datadesc/CMakeLists.txt index 1cbd2f747e..096e8725a7 100644 --- a/teshsuite/gras/datadesc/CMakeLists.txt +++ b/teshsuite/gras/datadesc/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.6) -set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/teshsuite/gras/datadesc/") +set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") add_executable(datadesc_usage datadesc_usage.c datadesc_structs.c) diff --git a/teshsuite/msg/CMakeLists.txt b/teshsuite/msg/CMakeLists.txt index 2dc27bbcc7..c9c9ef37d7 100644 --- a/teshsuite/msg/CMakeLists.txt +++ b/teshsuite/msg/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.6) -set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/teshsuite/msg/") +set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") add_executable(get_sender ${PROJECT_DIRECTORY}/teshsuite/msg/get_sender.c) @@ -9,4 +9,4 @@ if(NOT WIN32) target_link_libraries(get_sender simgrid m pthread ) else(NOT WIN32) target_link_libraries(get_sender simgrid) -endif(NOT WIN32) \ No newline at end of file +endif(NOT WIN32) diff --git a/teshsuite/simdag/CMakeLists.txt b/teshsuite/simdag/CMakeLists.txt index 98bcd1433a..5b06f23578 100644 --- a/teshsuite/simdag/CMakeLists.txt +++ b/teshsuite/simdag/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.6) -set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/teshsuite/simdag/") +set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") 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 9386944cc2..d921c21269 100644 --- a/teshsuite/simdag/network/CMakeLists.txt +++ b/teshsuite/simdag/network/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.6) -set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/teshsuite/simdag/network/") +set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") 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 97eb5db011..b4bc5a5ee4 100644 --- a/teshsuite/simdag/network/mxn/CMakeLists.txt +++ b/teshsuite/simdag/network/mxn/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.6) -set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/teshsuite/simdag/network/mxn/") +set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") 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 652c48bb64..34b60fabd1 100644 --- a/teshsuite/simdag/network/p2p/CMakeLists.txt +++ b/teshsuite/simdag/network/p2p/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.6) -set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/teshsuite/simdag/network/p2p/") +set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") 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 86de84b169..cc357a28e4 100644 --- a/teshsuite/simdag/partask/CMakeLists.txt +++ b/teshsuite/simdag/partask/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.6) -set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/teshsuite/simdag/partask/") +set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") 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 91d6140955..29b2c14d80 100644 --- a/teshsuite/simdag/platforms/CMakeLists.txt +++ b/teshsuite/simdag/platforms/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.6) -set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/") +set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") add_executable(basic_parsing_test basic_parsing_test.c) add_executable(is_router_test is_router_test.c) diff --git a/teshsuite/xbt/CMakeLists.txt b/teshsuite/xbt/CMakeLists.txt index 5538eef272..59574a2b73 100644 --- a/teshsuite/xbt/CMakeLists.txt +++ b/teshsuite/xbt/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.6) -set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/teshsuite/xbt/") +set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") add_executable(log_large_test log_large_test.c) add_executable(parallel_log_crashtest parallel_log_crashtest.c) @@ -12,4 +12,4 @@ target_link_libraries(parallel_log_crashtest gras m pthread ) else(NOT WIN32) target_link_libraries(log_large_test gras) target_link_libraries(parallel_log_crashtest gras) -endif(NOT WIN32) \ No newline at end of file +endif(NOT WIN32) diff --git a/testsuite/simdag/CMakeLists.txt b/testsuite/simdag/CMakeLists.txt index 82696da7b0..6b303b8b53 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 "${CMAKE_CURRENT_BINARY_DIR}/testsuite/simdag/") +set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") add_executable(sd_test sd_test.c) diff --git a/testsuite/surf/CMakeLists.txt b/testsuite/surf/CMakeLists.txt index 6b654f306e..430586ee75 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 "${CMAKE_CURRENT_BINARY_DIR}/testsuite/surf/") +set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") 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 256baa78e0..5ad1fbad6f 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 "${CMAKE_CURRENT_BINARY_DIR}/testsuite/xbt/") +set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") add_executable(log_usage "log_usage.c") add_executable(graphxml_usage "graphxml_usage.c") diff --git a/tools/tesh/CMakeLists.txt b/tools/tesh/CMakeLists.txt index 37cd50b4bf..d128cbb4f9 100644 --- a/tools/tesh/CMakeLists.txt +++ b/tools/tesh/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.6) -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_BINARY_DIR}/bin/") +set(EXECUTABLE_OUTPUT_PATH "${CMAKE_BINARY_DIR}/bin") add_executable(tesh tesh.c run_context.c signal.c)