From 0256c6c4d91bc13aa6156df1452a417f29532975 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Sun, 27 Mar 2016 20:56:16 +0200 Subject: [PATCH] third attempt to fix the build without graphviz --- examples/simdag/CMakeLists.txt | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/examples/simdag/CMakeLists.txt b/examples/simdag/CMakeLists.txt index 8c0e5ee4e2..6144afbf28 100644 --- a/examples/simdag/CMakeLists.txt +++ b/examples/simdag/CMakeLists.txt @@ -6,21 +6,6 @@ foreach(x availability daxload fail typed_tasks io properties throttling schedul set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/${x}/sd_${x}.tesh) endforeach() -add_executable (goal_test goal/goal_test.c) -target_link_libraries(goal_test simgrid) -set_target_properties(goal_test PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/goal) - -set(tesh_files ${tesh_files} PARENT_SCOPE) -set(examples_src ${examples_src} ${CMAKE_CURRENT_SOURCE_DIR}/goal/goal_test.c PARENT_SCOPE) -set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/scheduling/Montage_25.xml - ${CMAKE_CURRENT_SOURCE_DIR}/daxload/simple_dax_with_cycle.xml - ${CMAKE_CURRENT_SOURCE_DIR}/daxload/smalldax.xml PARENT_SCOPE) -set(bin_files ${bin_files} ${CMAKE_CURRENT_SOURCE_DIR}/platform_script.lua PARENT_SCOPE) -set(txt_files ${txt_files} ${CMAKE_CURRENT_SOURCE_DIR}/dag-dotload/dag_with_cycle.dot - ${CMAKE_CURRENT_SOURCE_DIR}/dag-dotload/dag.dot - ${CMAKE_CURRENT_SOURCE_DIR}/ptg-dotload/ptg.dot - ${CMAKE_CURRENT_SOURCE_DIR}/schedule-dotload/dag_with_bad_schedule.dot - ${CMAKE_CURRENT_SOURCE_DIR}/schedule-dotload/dag_with_good_schedule.dot PARENT_SCOPE) foreach(x availability daxload fail typed_tasks io properties throttling scheduling test) ADD_TESH(simdag-${x} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/simdag --cd ${CMAKE_BINARY_DIR}/examples/simdag ${CMAKE_HOME_DIRECTORY}/examples/simdag/${x}/sd_${x}.tesh) endforeach() @@ -38,3 +23,19 @@ foreach(x dag-dotload ptg-dotload schedule-dotload) set(examples_src ${examples_src} ${CMAKE_CURRENT_SOURCE_DIR}/${x}/sd_${x}.c) set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/${x}/sd_${x}.tesh) endforeach() + +add_executable (goal_test goal/goal_test.c) +target_link_libraries(goal_test simgrid) +set_target_properties(goal_test PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/goal) + +set(tesh_files ${tesh_files} PARENT_SCOPE) +set(examples_src ${examples_src} ${CMAKE_CURRENT_SOURCE_DIR}/goal/goal_test.c PARENT_SCOPE) +set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/scheduling/Montage_25.xml + ${CMAKE_CURRENT_SOURCE_DIR}/daxload/simple_dax_with_cycle.xml + ${CMAKE_CURRENT_SOURCE_DIR}/daxload/smalldax.xml PARENT_SCOPE) +set(bin_files ${bin_files} ${CMAKE_CURRENT_SOURCE_DIR}/platform_script.lua PARENT_SCOPE) +set(txt_files ${txt_files} ${CMAKE_CURRENT_SOURCE_DIR}/dag-dotload/dag_with_cycle.dot + ${CMAKE_CURRENT_SOURCE_DIR}/dag-dotload/dag.dot + ${CMAKE_CURRENT_SOURCE_DIR}/ptg-dotload/ptg.dot + ${CMAKE_CURRENT_SOURCE_DIR}/schedule-dotload/dag_with_bad_schedule.dot + ${CMAKE_CURRENT_SOURCE_DIR}/schedule-dotload/dag_with_good_schedule.dot PARENT_SCOPE) -- 2.20.1