From 436ba8919bffc97ff5295755941afa40d26d3a78 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Paul=20B=C3=A9daride?= Date: Tue, 1 Jul 2014 14:52:39 +0200 Subject: [PATCH] Fix CMakeLists.txt --- buildtools/Cmake/DefinePackages.cmake | 9 +++++++++ examples/lua/CMakeLists.txt | 1 - examples/msg/CMakeLists.txt | 2 -- examples/msg/actions/CMakeLists.txt | 1 - examples/msg/chainsend/CMakeLists.txt | 1 - examples/msg/cloud/CMakeLists.txt | 1 - examples/msg/energy/e1/CMakeLists.txt | 1 - examples/msg/energy/e2/CMakeLists.txt | 1 - examples/msg/energy/e3/CMakeLists.txt | 1 - examples/msg/icomms/CMakeLists.txt | 1 - examples/msg/masterslave/CMakeLists.txt | 2 -- examples/msg/ns3/CMakeLists.txt | 3 --- examples/msg/parallel_task/CMakeLists.txt | 1 - examples/msg/sendrecv/CMakeLists.txt | 1 - examples/msg/tracing/CMakeLists.txt | 3 --- examples/scala/CMakeLists.txt | 1 - examples/scala/master_slave_bypass/CMakeLists.txt | 1 - examples/scala/master_slave_kill/CMakeLists.txt | 1 - examples/scala/masterslave/CMakeLists.txt | 1 - teshsuite/surf/CMakeLists.txt | 4 ---- 20 files changed, 9 insertions(+), 28 deletions(-) diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake index 3e821daca5..e4d0f42ece 100644 --- a/buildtools/Cmake/DefinePackages.cmake +++ b/buildtools/Cmake/DefinePackages.cmake @@ -1181,9 +1181,13 @@ set(PLATFORMS_EXAMPLES examples/platforms/conf/lcg_sept2004_grid.xml examples/platforms/conf/transform_optorsim_platform.pl examples/platforms/config.xml + examples/platforms/config_tracing.xml examples/platforms/content/small_content.txt examples/platforms/content/storage_content.txt examples/platforms/content/win_storage_content.txt + examples/platforms/trace/trace_A_failure.txt + examples/platforms/trace/trace_A.txt + examples/platforms/trace/trace_B.txt examples/platforms/data_center.xml examples/platforms/deployment_remote_io.xml examples/platforms/energy_platform.xml @@ -1202,6 +1206,10 @@ set(PLATFORMS_EXAMPLES examples/platforms/routing_cluster.xml examples/platforms/storage.xml examples/platforms/small_platform.xml + examples/platforms/small_platform_fatpipe.xml + examples/platforms/small_platform_one_link_routes.xml + examples/platforms/small_platform_with_failures.xml + examples/platforms/small_platform_with_routers.xml examples/platforms/syscoord/generate_peer_platform.pl examples/platforms/syscoord/median_harvard.syscoord examples/platforms/syscoord/median_harvard.xml @@ -1211,6 +1219,7 @@ set(PLATFORMS_EXAMPLES examples/platforms/syscoord/median_p2psim.xml examples/platforms/torus_cluster.xml examples/platforms/two_hosts_platform.xml + examples/platforms/two_hosts_platform_with_availability.xml examples/platforms/two_peers.xml examples/platforms/vivaldi.xml ) diff --git a/examples/lua/CMakeLists.txt b/examples/lua/CMakeLists.txt index e37c3c2b9e..90ecd2005b 100644 --- a/examples/lua/CMakeLists.txt +++ b/examples/lua/CMakeLists.txt @@ -17,7 +17,6 @@ set(xml_files ${CMAKE_CURRENT_SOURCE_DIR}/bittorrent/bittorrent.xml ${CMAKE_CURRENT_SOURCE_DIR}/kademlia/kademlia.xml ${CMAKE_CURRENT_SOURCE_DIR}/multi_matrix/quicksort_deployment.xml - ${CMAKE_CURRENT_SOURCE_DIR}/multi_matrix/quicksort_platform.xml ${CMAKE_CURRENT_SOURCE_DIR}/state_cloner/deployment_duplicated_globals.xml PARENT_SCOPE ) diff --git a/examples/msg/CMakeLists.txt b/examples/msg/CMakeLists.txt index 5435706daa..fc237264af 100644 --- a/examples/msg/CMakeLists.txt +++ b/examples/msg/CMakeLists.txt @@ -6,8 +6,6 @@ set(tesh_files ) set(xml_files ${xml_files} - ${CMAKE_CURRENT_SOURCE_DIR}/small_platform_with_failures.xml - ${CMAKE_CURRENT_SOURCE_DIR}/small_platform_with_routers.xml PARENT_SCOPE ) set(examples_src diff --git a/examples/msg/actions/CMakeLists.txt b/examples/msg/actions/CMakeLists.txt index 419c27ee6e..82cb0f0bad 100644 --- a/examples/msg/actions/CMakeLists.txt +++ b/examples/msg/actions/CMakeLists.txt @@ -15,7 +15,6 @@ set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/deployment_split.xml ${CMAKE_CURRENT_SOURCE_DIR}/deployment.xml - ${CMAKE_CURRENT_SOURCE_DIR}/homogeneous_3_hosts.xml PARENT_SCOPE ) set(examples_src diff --git a/examples/msg/chainsend/CMakeLists.txt b/examples/msg/chainsend/CMakeLists.txt index 5111865c3b..892f0fe575 100644 --- a/examples/msg/chainsend/CMakeLists.txt +++ b/examples/msg/chainsend/CMakeLists.txt @@ -15,7 +15,6 @@ set(tesh_files set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/deployment_tesh.xml - ${CMAKE_CURRENT_SOURCE_DIR}/platform_chainsend.xml PARENT_SCOPE ) set(examples_src diff --git a/examples/msg/cloud/CMakeLists.txt b/examples/msg/cloud/CMakeLists.txt index 99150306a4..aba884a838 100644 --- a/examples/msg/cloud/CMakeLists.txt +++ b/examples/msg/cloud/CMakeLists.txt @@ -29,7 +29,6 @@ set(tesh_files ) set(xml_files ${xml_files} - ${CMAKE_CURRENT_SOURCE_DIR}/simple_plat.xml ${CMAKE_CURRENT_SOURCE_DIR}/multicore_plat.xml PARENT_SCOPE ) diff --git a/examples/msg/energy/e1/CMakeLists.txt b/examples/msg/energy/e1/CMakeLists.txt index d8d7dd8158..ef321778b9 100644 --- a/examples/msg/energy/e1/CMakeLists.txt +++ b/examples/msg/energy/e1/CMakeLists.txt @@ -16,7 +16,6 @@ set(tesh_files set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/deployment_e1.xml - ${CMAKE_CURRENT_SOURCE_DIR}/platform_e1.xml PARENT_SCOPE ) diff --git a/examples/msg/energy/e2/CMakeLists.txt b/examples/msg/energy/e2/CMakeLists.txt index 98e96dccc9..28d2e97a9d 100644 --- a/examples/msg/energy/e2/CMakeLists.txt +++ b/examples/msg/energy/e2/CMakeLists.txt @@ -16,7 +16,6 @@ set(tesh_files set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/deployment_e2.xml - ${CMAKE_CURRENT_SOURCE_DIR}/platform_e2.xml PARENT_SCOPE ) diff --git a/examples/msg/energy/e3/CMakeLists.txt b/examples/msg/energy/e3/CMakeLists.txt index eb60260628..caef0fd80c 100644 --- a/examples/msg/energy/e3/CMakeLists.txt +++ b/examples/msg/energy/e3/CMakeLists.txt @@ -16,7 +16,6 @@ set(tesh_files set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/deployment_e3.xml - ${CMAKE_CURRENT_SOURCE_DIR}/platform_e3.xml PARENT_SCOPE ) diff --git a/examples/msg/icomms/CMakeLists.txt b/examples/msg/icomms/CMakeLists.txt index a8f8f81558..38b44f42a4 100644 --- a/examples/msg/icomms/CMakeLists.txt +++ b/examples/msg/icomms/CMakeLists.txt @@ -24,7 +24,6 @@ set(xml_files ${CMAKE_CURRENT_SOURCE_DIR}/deployment_peer03.xml ${CMAKE_CURRENT_SOURCE_DIR}/deployment_peer04.xml ${CMAKE_CURRENT_SOURCE_DIR}/deployment_peer05.xml - ${CMAKE_CURRENT_SOURCE_DIR}/small_platform.xml PARENT_SCOPE ) set(examples_src diff --git a/examples/msg/masterslave/CMakeLists.txt b/examples/msg/masterslave/CMakeLists.txt index 91d61fb241..026a2de55e 100644 --- a/examples/msg/masterslave/CMakeLists.txt +++ b/examples/msg/masterslave/CMakeLists.txt @@ -58,11 +58,9 @@ set(xml_files ${CMAKE_CURRENT_SOURCE_DIR}/deployment_masterslave_forwarder.xml ${CMAKE_CURRENT_SOURCE_DIR}/deployment_masterslave_mailbox_multicore.xml ${CMAKE_CURRENT_SOURCE_DIR}/deployment_masterslave_vivaldi.xml - ${CMAKE_CURRENT_SOURCE_DIR}/platform_clusters.xml ${CMAKE_CURRENT_SOURCE_DIR}/deployment_masterslave_kill.xml ${CMAKE_CURRENT_SOURCE_DIR}/deployment_masterslave_mailbox.xml ${CMAKE_CURRENT_SOURCE_DIR}/deployment_masterslave.xml - ${CMAKE_CURRENT_SOURCE_DIR}/platform_kill.xml PARENT_SCOPE ) set(examples_src diff --git a/examples/msg/ns3/CMakeLists.txt b/examples/msg/ns3/CMakeLists.txt index 14d1498b47..56541cc66e 100644 --- a/examples/msg/ns3/CMakeLists.txt +++ b/examples/msg/ns3/CMakeLists.txt @@ -17,12 +17,9 @@ set(tesh_files set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/3hosts_2links_d.xml - ${CMAKE_CURRENT_SOURCE_DIR}/3hosts_2links_p.xml ${CMAKE_CURRENT_SOURCE_DIR}/3links-d-timer.xml ${CMAKE_CURRENT_SOURCE_DIR}/3links-d.xml - ${CMAKE_CURRENT_SOURCE_DIR}/3links-p.xml ${CMAKE_CURRENT_SOURCE_DIR}/dogbone-d.xml - ${CMAKE_CURRENT_SOURCE_DIR}/dogbone-p.xml ${CMAKE_CURRENT_SOURCE_DIR}/One_cluster-d.xml ${CMAKE_CURRENT_SOURCE_DIR}/Two_clusters-d.xml PARENT_SCOPE diff --git a/examples/msg/parallel_task/CMakeLists.txt b/examples/msg/parallel_task/CMakeLists.txt index 788b2e8f1c..9512a4ccc5 100644 --- a/examples/msg/parallel_task/CMakeLists.txt +++ b/examples/msg/parallel_task/CMakeLists.txt @@ -17,7 +17,6 @@ set(tesh_files set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/test_ptask_deployment.xml - ${CMAKE_CURRENT_SOURCE_DIR}/test_ptask_platform.xml PARENT_SCOPE ) set(examples_src diff --git a/examples/msg/sendrecv/CMakeLists.txt b/examples/msg/sendrecv/CMakeLists.txt index bc61bfd0e1..837ca72dec 100644 --- a/examples/msg/sendrecv/CMakeLists.txt +++ b/examples/msg/sendrecv/CMakeLists.txt @@ -18,7 +18,6 @@ set(tesh_files set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/deployment_sendrecv.xml - ${CMAKE_CURRENT_SOURCE_DIR}/platform_sendrecv.xml PARENT_SCOPE ) set(examples_src diff --git a/examples/msg/tracing/CMakeLists.txt b/examples/msg/tracing/CMakeLists.txt index 1da4a813f9..4cee270282 100644 --- a/examples/msg/tracing/CMakeLists.txt +++ b/examples/msg/tracing/CMakeLists.txt @@ -45,9 +45,6 @@ set(tesh_files set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/deployment.xml - ${CMAKE_CURRENT_SOURCE_DIR}/platform.xml - ${CMAKE_CURRENT_SOURCE_DIR}/platform-as.xml - ${CMAKE_CURRENT_SOURCE_DIR}/platform-config.xml ${CMAKE_CURRENT_SOURCE_DIR}/procmig-deploy.xml PARENT_SCOPE ) diff --git a/examples/scala/CMakeLists.txt b/examples/scala/CMakeLists.txt index 90617f925e..b3676d2895 100644 --- a/examples/scala/CMakeLists.txt +++ b/examples/scala/CMakeLists.txt @@ -6,7 +6,6 @@ set(tesh_files ) set(xml_files ${xml_files} - ${CMAKE_CURRENT_SOURCE_DIR}/platform.xml PARENT_SCOPE ) set(examples_src diff --git a/examples/scala/master_slave_bypass/CMakeLists.txt b/examples/scala/master_slave_bypass/CMakeLists.txt index ad451aef53..7226ae1709 100644 --- a/examples/scala/master_slave_bypass/CMakeLists.txt +++ b/examples/scala/master_slave_bypass/CMakeLists.txt @@ -28,7 +28,6 @@ set(tesh_files ) set(xml_files ${xml_files} - ${CMAKE_CURRENT_SOURCE_DIR}/platform.xml PARENT_SCOPE ) set(examples_src diff --git a/examples/scala/master_slave_kill/CMakeLists.txt b/examples/scala/master_slave_kill/CMakeLists.txt index ebd2979efd..4880c53bb6 100644 --- a/examples/scala/master_slave_kill/CMakeLists.txt +++ b/examples/scala/master_slave_kill/CMakeLists.txt @@ -28,7 +28,6 @@ set(tesh_files ) set(xml_files ${xml_files} - ${CMAKE_CURRENT_SOURCE_DIR}/platform.xml PARENT_SCOPE ) set(examples_src diff --git a/examples/scala/masterslave/CMakeLists.txt b/examples/scala/masterslave/CMakeLists.txt index 5c2bcccb3d..0e1c2f5e4f 100644 --- a/examples/scala/masterslave/CMakeLists.txt +++ b/examples/scala/masterslave/CMakeLists.txt @@ -29,7 +29,6 @@ set(tesh_files ) set(xml_files ${xml_files} - ${CMAKE_CURRENT_SOURCE_DIR}/deploy.xml ${CMAKE_CURRENT_SOURCE_DIR}/masterslaveDeployment.xml PARENT_SCOPE ) diff --git a/teshsuite/surf/CMakeLists.txt b/teshsuite/surf/CMakeLists.txt index 8c44e073f0..50284bc907 100644 --- a/teshsuite/surf/CMakeLists.txt +++ b/teshsuite/surf/CMakeLists.txt @@ -4,13 +4,9 @@ set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") set(xml_files ${xml_files} - ${CMAKE_CURRENT_SOURCE_DIR}/platform.xml PARENT_SCOPE ) set(txt_files ${txt_files} - ${CMAKE_CURRENT_SOURCE_DIR}/trace_A_failure.txt - ${CMAKE_CURRENT_SOURCE_DIR}/trace_A.txt - ${CMAKE_CURRENT_SOURCE_DIR}/trace_B.txt PARENT_SCOPE ) -- 2.20.1