From f0cae293c654eee7f33608d298043d58b80b5f2d Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Mon, 21 Mar 2016 10:03:38 +0100 Subject: [PATCH] get rid of teshsuite/simdag/CMakeLists.txt --- teshsuite/simdag/CMakeLists.txt | 8 ++++++++ .../evaluate-get-route-time.c} | 0 .../evaluate-parse-time.c} | 0 teshsuite/simdag/platforms/CMakeLists.txt | 8 -------- tools/cmake/DefinePackages.cmake | 1 - 5 files changed, 8 insertions(+), 9 deletions(-) rename teshsuite/simdag/{platforms/evaluate_get_route_time.c => evaluate-get-route-time/evaluate-get-route-time.c} (100%) rename teshsuite/simdag/{platforms/evaluate_parse_time.c => evaluate-parse-time/evaluate-parse-time.c} (100%) delete mode 100644 teshsuite/simdag/platforms/CMakeLists.txt diff --git a/teshsuite/simdag/CMakeLists.txt b/teshsuite/simdag/CMakeLists.txt index 8d426255c5..1675e46252 100644 --- a/teshsuite/simdag/CMakeLists.txt +++ b/teshsuite/simdag/CMakeLists.txt @@ -11,6 +11,14 @@ foreach(x availability basic0 basic1 basic2 basic3 basic4 basic5 basic6 basic-li ADD_TESH(tesh-simdag-${x} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/${x} --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/${x} ${x}.tesh) endforeach() +foreach(x evaluate-parse-time evaluate-get-route-time) + add_executable (${x} ${x}/${x}.c) + target_link_libraries(${x} simgrid) + set_target_properties(${x} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${x}) + + set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/${x}/${x}.c) +endforeach() + foreach(x flatifier is-router) add_executable (${x} ${x}/${x}.cpp) target_link_libraries(${x} simgrid) diff --git a/teshsuite/simdag/platforms/evaluate_get_route_time.c b/teshsuite/simdag/evaluate-get-route-time/evaluate-get-route-time.c similarity index 100% rename from teshsuite/simdag/platforms/evaluate_get_route_time.c rename to teshsuite/simdag/evaluate-get-route-time/evaluate-get-route-time.c diff --git a/teshsuite/simdag/platforms/evaluate_parse_time.c b/teshsuite/simdag/evaluate-parse-time/evaluate-parse-time.c similarity index 100% rename from teshsuite/simdag/platforms/evaluate_parse_time.c rename to teshsuite/simdag/evaluate-parse-time/evaluate-parse-time.c diff --git a/teshsuite/simdag/platforms/CMakeLists.txt b/teshsuite/simdag/platforms/CMakeLists.txt deleted file mode 100644 index d18f0e90a2..0000000000 --- a/teshsuite/simdag/platforms/CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ -foreach(x evaluate_parse_time evaluate_get_route_time) - add_executable (${x} ${x}.c) - target_link_libraries(${x} simgrid) - - set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/${x}.c) -endforeach() - -set(teshsuite_src ${teshsuite_src} PARENT_SCOPE) \ No newline at end of file diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index a55c749d23..351226cc2e 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -990,7 +990,6 @@ set(CMAKEFILES_TXT teshsuite/mc/CMakeLists.txt teshsuite/msg/CMakeLists.txt teshsuite/simdag/CMakeLists.txt - teshsuite/simdag/platforms/CMakeLists.txt teshsuite/simix/CMakeLists.txt teshsuite/smpi/CMakeLists.txt teshsuite/surf/CMakeLists.txt -- 2.20.1