X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/09f40273ab00f229cfcdb2590b281296a2a75c7e..7aa058f61406a26cf8ff9f1a04bfca254c775c62:/examples/deprecated/msg/CMakeLists.txt diff --git a/examples/deprecated/msg/CMakeLists.txt b/examples/deprecated/msg/CMakeLists.txt index 8fe431f9e6..0e62567023 100644 --- a/examples/deprecated/msg/CMakeLists.txt +++ b/examples/deprecated/msg/CMakeLists.txt @@ -13,16 +13,6 @@ foreach(x app-masterworker cloud-masterworker set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/${x}/${x}.tesh) endforeach() -# CPP examples -foreach(x maestro-set) - add_executable (${x} EXCLUDE_FROM_ALL ${x}/${x}.cpp) - target_link_libraries(${x} simgrid) - set_target_properties(${x} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${x}) - add_dependencies(tests ${x}) - set(examples_src ${examples_src} ${CMAKE_CURRENT_SOURCE_DIR}/${x}/${x}.cpp) - set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/${x}/${x}.tesh) -endforeach() - if(SIMGRID_HAVE_NS3) add_executable (network-ns3 EXCLUDE_FROM_ALL network-ns3/network-ns3.c) target_link_libraries(network-ns3 simgrid) @@ -62,7 +52,7 @@ set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/app-masterworker/a ${CMAKE_CURRENT_SOURCE_DIR}/network-ns3/one_cluster_d.xml PARENT_SCOPE) foreach(x app-masterworker cloud-masterworker - dht-pastry dht-kademlia # FIXME: platform-failures is disabled + dht-pastry dht-kademlia platform-failures energy-vm process-create synchro-semaphore) @@ -82,16 +72,10 @@ foreach (x trace-categories trace-route-user-variables trace-link-user-variables endforeach() ADD_TESH_FACTORIES(msg-dht-kademlia-parallel "thread;ucontext;raw;boost" --cfg contexts/nthreads:4 ${CONTEXTS_SYNCHRO} - --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/dht-kademlia - --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg/dht-kademlia - --setenv platfdir=${CMAKE_HOME_DIRECTORY}/examples/platforms - ${CMAKE_HOME_DIRECTORY}/examples/msg/dht-kademlia/dht-kademlia.tesh) - -if(NOT WIN32) - ADD_TESH_FACTORIES(msg-maestro-set "thread" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/deprecated/msg --cd ${CMAKE_BINARY_DIR}/examples/deprecated/msg ${CMAKE_HOME_DIRECTORY}/examples/deprecated/msg/maestro-set/maestro-set.tesh) -else() - message("Test maestro-set disabled on windows: this feature is not working") -endif() + --setenv bindir=${CMAKE_BINARY_DIR}/examples/deprecated/msg/dht-kademlia + --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/deprecated/msg/dht-kademlia + --setenv platfdir=${CMAKE_HOME_DIRECTORY}/examples/platforms + ${CMAKE_HOME_DIRECTORY}/examples/deprecated/msg/dht-kademlia/dht-kademlia.tesh) ADD_TESH_FACTORIES(app-masterworker-multicore "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/deprecated/msg/app-masterworker