From: Martin Quinson Date: Tue, 23 Feb 2016 10:49:59 +0000 (+0100) Subject: various cleanups in the CMakeLists.txt files X-Git-Tag: v3_13~729 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/1a4fbd7770910a461be806b05bff0dfdf9a87e5e?hp=23da67335f942457b0d8b1f10e9849eba0eee9f7 various cleanups in the CMakeLists.txt files - We never need to explicitly list pthread as a dependency - Files are searched in ${CMAKE_CURRENT_SOURCE_DIR} by default - Default value of EXECUTABLE_OUTPUT_PATH is ${CMAKE_CURRENT_BINARY_DIR} when cmake/UnitTesting does not mess with it. - Indentation cosmetics: these files are boring, don't make them ugly --- diff --git a/.gitignore b/.gitignore index be91017496..7f723965b2 100644 --- a/.gitignore +++ b/.gitignore @@ -227,7 +227,6 @@ examples/simdag/ex_sd_test2 examples/simdag/ex_sd_test_console examples/simdag/goal/goal_test examples/simdag/io/sd_io -examples/simdag/metaxml/sd_meta examples/simdag/properties/sd_prop examples/simdag/scheduling/minmin_test examples/simdag/scheduling/Montage_25.jed @@ -268,7 +267,7 @@ examples/smpi/smpi_traced.trace examples/smpi/toto.txt examples/smpi/ttest01 src/replay/replay -src/testall +testall teshsuite/bug-17132/bug-17132 teshsuite/datadesc_usage.out teshsuite/java/semaphore/java_semaphore_gc_compiled diff --git a/doc/doxygen/inside_tests.doc b/doc/doxygen/inside_tests.doc index ca1b7ede52..857183ebae 100644 --- a/doc/doxygen/inside_tests.doc +++ b/doc/doxygen/inside_tests.doc @@ -41,17 +41,17 @@ ctest -R msg- -j5 --output-on-failure # You changed MSG and want to check that y \section inside_tests_rununit Running the unit tests -All unit tests are packed into the testall binary, that lives in src/. -These tests are run when you launch ctest, don't worry. +All unit tests are packed into the testall binary, that lives at the +source root. These tests are run when you launch ctest, don't worry. \verbatim -make testall # Rebuild the test runner on need -./src/testall # Launch all tests -./src/testall --help # revise how it goes if you forgot -./src/testall --tests=-all # run no test at all (yeah, that's useless) -./src/testall --dump-only # Display all existing test suite -./src/testall --tests=-all,+dict # Only launch the tests from the dict testsuite -./src/testall --tests=-all,+foo:bar # run only the bar test from the foo suite. +make testall # Rebuild the test runner on need +./testall # Launch all tests +./testall --help # revise how it goes if you forgot +./testall --tests=-all # run no test at all (yeah, that's useless) +./testall --dump-only # Display all existing test suite +./testall --tests=-all,+dict # Only launch the tests from the dict testsuite +./testall --tests=-all,+foo:bar # run only the bar test from the foo suite. \endverbatim diff --git a/examples/java/CMakeLists.txt b/examples/java/CMakeLists.txt deleted file mode 100644 index 94da85fe99..0000000000 --- a/examples/java/CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ -set(tesh_files - ${tesh_files} - PARENT_SCOPE) -set(xml_files - ${xml_files} - PARENT_SCOPE) -set(examples_src - ${examples_src} - PARENT_SCOPE) -set(bin_files - ${bin_files} - PARENT_SCOPE) -set(txt_files - ${txt_files} - PARENT_SCOPE) - diff --git a/examples/java/async/CMakeLists.txt b/examples/java/async/CMakeLists.txt index 6aa09feac5..5af0c74a4c 100644 --- a/examples/java/async/CMakeLists.txt +++ b/examples/java/async/CMakeLists.txt @@ -1,11 +1,5 @@ set(example java_async) -set(sources - ${CMAKE_CURRENT_SOURCE_DIR}/AsyncTest.java - ${CMAKE_CURRENT_SOURCE_DIR}/FinalizeTask.java - ${CMAKE_CURRENT_SOURCE_DIR}/Forwarder.java - ${CMAKE_CURRENT_SOURCE_DIR}/Master.java - ${CMAKE_CURRENT_SOURCE_DIR}/Slave.java - ) +set(sources AsyncTest.java FinalizeTask.java Forwarder.java Master.java Slave.java) if(enable_java) add_custom_command( diff --git a/examples/java/bittorrent/CMakeLists.txt b/examples/java/bittorrent/CMakeLists.txt index 6d7c80e7ab..04310a5e79 100644 --- a/examples/java/bittorrent/CMakeLists.txt +++ b/examples/java/bittorrent/CMakeLists.txt @@ -1,13 +1,5 @@ set(example java_bittorrent) -set(sources - ${CMAKE_CURRENT_SOURCE_DIR}/Bittorrent.java - ${CMAKE_CURRENT_SOURCE_DIR}/Common.java - ${CMAKE_CURRENT_SOURCE_DIR}/Connection.java - ${CMAKE_CURRENT_SOURCE_DIR}/MessageTask.java - ${CMAKE_CURRENT_SOURCE_DIR}/Peer.java - ${CMAKE_CURRENT_SOURCE_DIR}/Tracker.java - ${CMAKE_CURRENT_SOURCE_DIR}/TrackerTask.java - ) +set(sources Bittorrent.java Common.java Connection.java MessageTask.java Peer.java Tracker.java TrackerTask.java) if(enable_java) add_custom_command( diff --git a/examples/java/chord/CMakeLists.txt b/examples/java/chord/CMakeLists.txt index f56a6dac2c..6c5e10bf91 100644 --- a/examples/java/chord/CMakeLists.txt +++ b/examples/java/chord/CMakeLists.txt @@ -1,15 +1,5 @@ set(example java_chord) -set(sources - ${CMAKE_CURRENT_SOURCE_DIR}/Chord.java - ${CMAKE_CURRENT_SOURCE_DIR}/ChordTask.java - ${CMAKE_CURRENT_SOURCE_DIR}/Common.java - ${CMAKE_CURRENT_SOURCE_DIR}/FindSuccessorAnswerTask.java - ${CMAKE_CURRENT_SOURCE_DIR}/FindSuccessorTask.java - ${CMAKE_CURRENT_SOURCE_DIR}/GetPredecessorAnswerTask.java - ${CMAKE_CURRENT_SOURCE_DIR}/GetPredecessorTask.java - ${CMAKE_CURRENT_SOURCE_DIR}/Node.java - ${CMAKE_CURRENT_SOURCE_DIR}/NotifyTask.java - ) +set(sources Chord.java ChordTask.java Common.java FindSuccessorAnswerTask.java FindSuccessorTask.java GetPredecessorAnswerTask.java GetPredecessorTask.java Node.java NotifyTask.java) if(enable_java) add_custom_command( diff --git a/examples/java/cloud/CMakeLists.txt b/examples/java/cloud/CMakeLists.txt index 9a643921fe..f42a738575 100644 --- a/examples/java/cloud/CMakeLists.txt +++ b/examples/java/cloud/CMakeLists.txt @@ -1,10 +1,5 @@ set(example java_cloud) -set(sources - ${CMAKE_CURRENT_SOURCE_DIR}/Cloud.java - ${CMAKE_CURRENT_SOURCE_DIR}/FinalizeTask.java - ${CMAKE_CURRENT_SOURCE_DIR}/Master.java - ${CMAKE_CURRENT_SOURCE_DIR}/Slave.java - ) +set(sources Cloud.java FinalizeTask.java Master.java Slave.java) if(enable_java) add_custom_command( diff --git a/examples/java/cloud/energy/CMakeLists.txt b/examples/java/cloud/energy/CMakeLists.txt index b02fcf6e04..bcc3e9a80a 100644 --- a/examples/java/cloud/energy/CMakeLists.txt +++ b/examples/java/cloud/energy/CMakeLists.txt @@ -1,8 +1,5 @@ set(example java_cloud_energy) -set(sources - ${CMAKE_CURRENT_SOURCE_DIR}/Main.java - ${CMAKE_CURRENT_SOURCE_DIR}/EnergyVMRunner.java - ) +set(sources Main.java EnergyVMRunner.java) if(enable_java) add_custom_command( diff --git a/examples/java/cloud/migration/CMakeLists.txt b/examples/java/cloud/migration/CMakeLists.txt index 4cd57c4617..8c94c6d2fe 100644 --- a/examples/java/cloud/migration/CMakeLists.txt +++ b/examples/java/cloud/migration/CMakeLists.txt @@ -1,11 +1,5 @@ set(example java_cloud_migration) -set(sources - ${CMAKE_CURRENT_SOURCE_DIR}/Daemon.java - ${CMAKE_CURRENT_SOURCE_DIR}/Main.java - ${CMAKE_CURRENT_SOURCE_DIR}/Test.java - ${CMAKE_CURRENT_SOURCE_DIR}/TestHostOnOff.java - ${CMAKE_CURRENT_SOURCE_DIR}/XVM.java - ) +set(sources Daemon.java Main.java Test.java TestHostOnOff.java XVM.java) if(enable_java) add_custom_command( diff --git a/examples/java/commTime/CMakeLists.txt b/examples/java/commTime/CMakeLists.txt index 5014ac6e7b..295bc9cf5b 100644 --- a/examples/java/commTime/CMakeLists.txt +++ b/examples/java/commTime/CMakeLists.txt @@ -1,10 +1,5 @@ set(example java_commTime) -set(sources - ${CMAKE_CURRENT_SOURCE_DIR}/CommTimeTest.java - ${CMAKE_CURRENT_SOURCE_DIR}/FinalizeTask.java - ${CMAKE_CURRENT_SOURCE_DIR}/Master.java - ${CMAKE_CURRENT_SOURCE_DIR}/Slave.java - ) +set(sources CommTimeTest.java FinalizeTask.java Master.java Slave.java) if(enable_java) add_custom_command( diff --git a/examples/java/energy/CMakeLists.txt b/examples/java/energy/CMakeLists.txt index 2ad4d43d35..527fb659b0 100644 --- a/examples/java/energy/CMakeLists.txt +++ b/examples/java/energy/CMakeLists.txt @@ -1,8 +1,5 @@ set(example java_energy) -set(sources - ${CMAKE_CURRENT_SOURCE_DIR}/EnergyConsumer.java - ${CMAKE_CURRENT_SOURCE_DIR}/Energy.java - ) +set(sources EnergyConsumer.java Energy.java) if(enable_java) add_custom_command( diff --git a/examples/java/io/CMakeLists.txt b/examples/java/io/CMakeLists.txt index c761d3bd24..a4e792a5ab 100644 --- a/examples/java/io/CMakeLists.txt +++ b/examples/java/io/CMakeLists.txt @@ -1,10 +1,5 @@ set(example java_io) -set(sources - ${CMAKE_CURRENT_SOURCE_DIR}/IO.java - ${CMAKE_CURRENT_SOURCE_DIR}/Node.java - ${CMAKE_CURRENT_SOURCE_DIR}/Storage.java - ${CMAKE_CURRENT_SOURCE_DIR}/Client.java - ) +set(sources IO.java Node.java Storage.java Client.java) if(enable_java) add_custom_command( diff --git a/examples/java/kademlia/CMakeLists.txt b/examples/java/kademlia/CMakeLists.txt index 5767cd2dd4..5289ac82b8 100644 --- a/examples/java/kademlia/CMakeLists.txt +++ b/examples/java/kademlia/CMakeLists.txt @@ -1,18 +1,6 @@ set(example java_kademlia) -set(sources - ${CMAKE_CURRENT_SOURCE_DIR}/Answer.java - ${CMAKE_CURRENT_SOURCE_DIR}/Bucket.java - ${CMAKE_CURRENT_SOURCE_DIR}/Common.java - ${CMAKE_CURRENT_SOURCE_DIR}/Contact.java - ${CMAKE_CURRENT_SOURCE_DIR}/FindNodeAnswerTask.java - ${CMAKE_CURRENT_SOURCE_DIR}/FindNodeTask.java - ${CMAKE_CURRENT_SOURCE_DIR}/Kademlia.java - ${CMAKE_CURRENT_SOURCE_DIR}/KademliaTask.java - ${CMAKE_CURRENT_SOURCE_DIR}/Node.java - ${CMAKE_CURRENT_SOURCE_DIR}/PingAnswerTask.java - ${CMAKE_CURRENT_SOURCE_DIR}/PingTask.java - ${CMAKE_CURRENT_SOURCE_DIR}/RoutingTable.java - ) +set(sources Kademlia.java + Answer.java Bucket.java Common.java Contact.java FindNodeAnswerTask.java FindNodeTask.java KademliaTask.java Node.java PingAnswerTask.java PingTask.java RoutingTable.java) if(enable_java) add_custom_command( diff --git a/examples/java/master_slave_bypass/CMakeLists.txt b/examples/java/master_slave_bypass/CMakeLists.txt index 7ed961f522..fbb6934096 100644 --- a/examples/java/master_slave_bypass/CMakeLists.txt +++ b/examples/java/master_slave_bypass/CMakeLists.txt @@ -1,10 +1,5 @@ set(example java_master_slave_bypass) -set(sources - ${CMAKE_CURRENT_SOURCE_DIR}/FinalizeTask.java - ${CMAKE_CURRENT_SOURCE_DIR}/Master.java - ${CMAKE_CURRENT_SOURCE_DIR}/MsBypass.java - ${CMAKE_CURRENT_SOURCE_DIR}/Slave.java - ) +set(sources FinalizeTask.java Master.java MsBypass.java Slave.java) if(enable_java) add_custom_command( diff --git a/examples/java/master_slave_kill/CMakeLists.txt b/examples/java/master_slave_kill/CMakeLists.txt index 1c6971ff43..69b7f07414 100644 --- a/examples/java/master_slave_kill/CMakeLists.txt +++ b/examples/java/master_slave_kill/CMakeLists.txt @@ -1,10 +1,5 @@ set(example java_master_slave_kill) -set(sources - ${CMAKE_CURRENT_SOURCE_DIR}/FinalizeTask.java - ${CMAKE_CURRENT_SOURCE_DIR}/Master.java - ${CMAKE_CURRENT_SOURCE_DIR}/MsKill.java - ${CMAKE_CURRENT_SOURCE_DIR}/Slave.java - ) +set(sources MsKill.java FinalizeTask.java Master.java Slave.java) if(enable_java) add_custom_command( diff --git a/examples/java/masterslave/CMakeLists.txt b/examples/java/masterslave/CMakeLists.txt index 3dabea0ca7..b6d3b6e589 100644 --- a/examples/java/masterslave/CMakeLists.txt +++ b/examples/java/masterslave/CMakeLists.txt @@ -1,11 +1,5 @@ set(example java_masterslave) -set(sources - ${CMAKE_CURRENT_SOURCE_DIR}/FinalizeTask.java - ${CMAKE_CURRENT_SOURCE_DIR}/Forwarder.java - ${CMAKE_CURRENT_SOURCE_DIR}/Master.java - ${CMAKE_CURRENT_SOURCE_DIR}/Masterslave.java - ${CMAKE_CURRENT_SOURCE_DIR}/Slave.java - ) +set(sources FinalizeTask.java Forwarder.java Master.java Masterslave.java Slave.java) if(enable_java) add_custom_command( diff --git a/examples/java/migration/CMakeLists.txt b/examples/java/migration/CMakeLists.txt index 27a2553671..ddd0580884 100644 --- a/examples/java/migration/CMakeLists.txt +++ b/examples/java/migration/CMakeLists.txt @@ -1,9 +1,5 @@ set(example java_migration) -set(sources - ${CMAKE_CURRENT_SOURCE_DIR}/Emigrant.java - ${CMAKE_CURRENT_SOURCE_DIR}/Migration.java - ${CMAKE_CURRENT_SOURCE_DIR}/Policeman.java - ) +set(sources Migration.java Emigrant.java Policeman.java) if(enable_java) add_custom_command( diff --git a/examples/java/mutualExclusion/CMakeLists.txt b/examples/java/mutualExclusion/CMakeLists.txt index 02048a8bd6..c7f9ee0a30 100644 --- a/examples/java/mutualExclusion/CMakeLists.txt +++ b/examples/java/mutualExclusion/CMakeLists.txt @@ -1,12 +1,5 @@ set(example java_mutualExclusion) -set(sources - ${CMAKE_CURRENT_SOURCE_DIR}/Coordinator.java - ${CMAKE_CURRENT_SOURCE_DIR}/GrantTask.java - ${CMAKE_CURRENT_SOURCE_DIR}/MutexCentral.java - ${CMAKE_CURRENT_SOURCE_DIR}/Node.java - ${CMAKE_CURRENT_SOURCE_DIR}/ReleaseTask.java - ${CMAKE_CURRENT_SOURCE_DIR}/RequestTask.java - ) +set(sources Coordinator.java GrantTask.java MutexCentral.java Node.java ReleaseTask.java RequestTask.java) if(enable_java) add_custom_command( diff --git a/examples/java/pingPong/CMakeLists.txt b/examples/java/pingPong/CMakeLists.txt index 1132494726..2c61823d19 100644 --- a/examples/java/pingPong/CMakeLists.txt +++ b/examples/java/pingPong/CMakeLists.txt @@ -1,10 +1,5 @@ set(example java_pingPong) -set(sources - ${CMAKE_CURRENT_SOURCE_DIR}/PingPongTask.java - ${CMAKE_CURRENT_SOURCE_DIR}/PingPongTest.java - ${CMAKE_CURRENT_SOURCE_DIR}/Receiver.java - ${CMAKE_CURRENT_SOURCE_DIR}/Sender.java - ) +set(sources PingPongTask.java PingPongTest.java Receiver.java Sender.java) if(enable_java) add_custom_command( diff --git a/examples/java/priority/CMakeLists.txt b/examples/java/priority/CMakeLists.txt index 1eb9ee4142..8cb21fb6ff 100644 --- a/examples/java/priority/CMakeLists.txt +++ b/examples/java/priority/CMakeLists.txt @@ -1,8 +1,5 @@ set(example java_priority) -set(sources - ${CMAKE_CURRENT_SOURCE_DIR}/Priority.java - ${CMAKE_CURRENT_SOURCE_DIR}/Test.java - ) +set(sources Priority.java Test.java) if(enable_java) add_custom_command( diff --git a/examples/java/startKillTime/CMakeLists.txt b/examples/java/startKillTime/CMakeLists.txt index 1a1bdc5e75..9f6f8d81f3 100644 --- a/examples/java/startKillTime/CMakeLists.txt +++ b/examples/java/startKillTime/CMakeLists.txt @@ -1,9 +1,5 @@ set(example java_startKillTime) -set(sources - ${CMAKE_CURRENT_SOURCE_DIR}/Master.java - ${CMAKE_CURRENT_SOURCE_DIR}/Slave.java - ${CMAKE_CURRENT_SOURCE_DIR}/StartKillTime.java - ) +set(sources Master.java Slave.java StartKillTime.java) if(enable_java) add_custom_command( diff --git a/examples/java/suspend/CMakeLists.txt b/examples/java/suspend/CMakeLists.txt index d978b49ffa..eb6ce3edc9 100644 --- a/examples/java/suspend/CMakeLists.txt +++ b/examples/java/suspend/CMakeLists.txt @@ -1,9 +1,5 @@ set(example java_suspend) -set(sources - ${CMAKE_CURRENT_SOURCE_DIR}/DreamMaster.java - ${CMAKE_CURRENT_SOURCE_DIR}/LazyGuy.java - ${CMAKE_CURRENT_SOURCE_DIR}/Suspend.java - ) +set(sources Suspend.java DreamMaster.java LazyGuy.java) if(enable_java) add_custom_command( diff --git a/examples/java/tracing/CMakeLists.txt b/examples/java/tracing/CMakeLists.txt index e21c754263..8949861235 100644 --- a/examples/java/tracing/CMakeLists.txt +++ b/examples/java/tracing/CMakeLists.txt @@ -1,10 +1,5 @@ set(example java_tracing) -set(sources - ${CMAKE_CURRENT_SOURCE_DIR}/PingPongTask.java - ${CMAKE_CURRENT_SOURCE_DIR}/Receiver.java - ${CMAKE_CURRENT_SOURCE_DIR}/Sender.java - ${CMAKE_CURRENT_SOURCE_DIR}/TracingTest.java - ) +set(sources PingPongTask.java Receiver.java Sender.java TracingTest.java) if(enable_java) add_custom_command( diff --git a/examples/msg/actions/CMakeLists.txt b/examples/msg/actions/CMakeLists.txt index 071af064f6..29a83d08a3 100644 --- a/examples/msg/actions/CMakeLists.txt +++ b/examples/msg/actions/CMakeLists.txt @@ -1,8 +1,6 @@ -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") -add_executable(actions actions.c) -add_executable(storage_actions storage_actions.c) - -target_link_libraries(actions simgrid) +add_executable (actions actions.c) +target_link_libraries(actions simgrid) +add_executable (storage_actions storage_actions.c) target_link_libraries(storage_actions simgrid) set(tesh_files diff --git a/examples/msg/bittorrent/CMakeLists.txt b/examples/msg/bittorrent/CMakeLists.txt index ef1d6ece6f..322e8dcf4a 100644 --- a/examples/msg/bittorrent/CMakeLists.txt +++ b/examples/msg/bittorrent/CMakeLists.txt @@ -1,9 +1,5 @@ -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - -add_executable(bittorrent "bittorrent.c" "messages.c" "peer.c" "tracker.c" "connection.c") - -### Add definitions for compile -target_link_libraries(bittorrent simgrid ) +add_executable (bittorrent bittorrent.c messages.c peer.c tracker.c connection.c) +target_link_libraries(bittorrent simgrid) set(tesh_files ${tesh_files} diff --git a/examples/msg/chainsend/CMakeLists.txt b/examples/msg/chainsend/CMakeLists.txt index 072a61f40b..773c0cb7a4 100644 --- a/examples/msg/chainsend/CMakeLists.txt +++ b/examples/msg/chainsend/CMakeLists.txt @@ -1,9 +1,5 @@ -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - -add_executable(chainsend chainsend.c iterator.c common.c messages.c broadcaster.c peer.c) - -### Add definitions for compile -target_link_libraries(chainsend simgrid ) +add_executable (chainsend chainsend.c iterator.c common.c messages.c broadcaster.c peer.c) +target_link_libraries(chainsend simgrid) set(tesh_files ${tesh_files} diff --git a/examples/msg/chord/CMakeLists.txt b/examples/msg/chord/CMakeLists.txt index 15c131edaa..c0a4dd85d1 100644 --- a/examples/msg/chord/CMakeLists.txt +++ b/examples/msg/chord/CMakeLists.txt @@ -1,9 +1,5 @@ -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - -add_executable(chord chord.c) - -### Add definitions for compile -target_link_libraries(chord simgrid ) +add_executable (chord chord.c) +target_link_libraries(chord simgrid) set(tesh_files ${tesh_files} diff --git a/examples/msg/cloud/CMakeLists.txt b/examples/msg/cloud/CMakeLists.txt index f32d0d98b3..0ff9719ed2 100644 --- a/examples/msg/cloud/CMakeLists.txt +++ b/examples/msg/cloud/CMakeLists.txt @@ -1,21 +1,17 @@ -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - -add_executable(master_worker_vm "master_worker_vm.c") -add_executable(simple_vm "simple_vm.c") -add_executable(migrate_vm "migrate_vm.c") -add_executable(bound "bound.c") -add_executable(scale "scale.c") -add_executable(multicore "multicore.c") -add_executable(two_tasks_vm "two_tasks_vm.c") - -### Add definitions for compile +add_executable (master_worker_vm master_worker_vm.c) target_link_libraries(master_worker_vm simgrid) -target_link_libraries(simple_vm simgrid) -target_link_libraries(migrate_vm simgrid) -target_link_libraries(bound simgrid) -target_link_libraries(scale simgrid) -target_link_libraries(multicore simgrid) -target_link_libraries(two_tasks_vm simgrid) +add_executable (simple_vm simple_vm.c) +target_link_libraries(simple_vm simgrid) +add_executable (migrate_vm migrate_vm.c) +target_link_libraries(migrate_vm simgrid) +add_executable (bound bound.c) +target_link_libraries(bound simgrid) +add_executable (scale scale.c) +target_link_libraries(scale simgrid) +add_executable (multicore multicore.c) +target_link_libraries(multicore simgrid) +add_executable (two_tasks_vm two_tasks_vm.c) +target_link_libraries(two_tasks_vm simgrid) set(tesh_files ${tesh_files} diff --git a/examples/msg/energy/consumption/CMakeLists.txt b/examples/msg/energy/consumption/CMakeLists.txt index 687973bfd1..5869c1423e 100644 --- a/examples/msg/energy/consumption/CMakeLists.txt +++ b/examples/msg/energy/consumption/CMakeLists.txt @@ -1,8 +1,4 @@ -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - -add_executable(energy_consumption energy_consumption.c) - -### Add definitions for compile +add_executable (energy_consumption energy_consumption.c) target_link_libraries(energy_consumption simgrid) set(tesh_files diff --git a/examples/msg/energy/onoff/CMakeLists.txt b/examples/msg/energy/onoff/CMakeLists.txt index 73c7813957..3832f22f6c 100644 --- a/examples/msg/energy/onoff/CMakeLists.txt +++ b/examples/msg/energy/onoff/CMakeLists.txt @@ -1,9 +1,5 @@ -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - -add_executable(onoff onoff.c) - -### Add definitions for compile -target_link_libraries(onoff simgrid ) +add_executable (onoff onoff.c) +target_link_libraries(onoff simgrid) set(tesh_files ${tesh_files} diff --git a/examples/msg/energy/pstate/CMakeLists.txt b/examples/msg/energy/pstate/CMakeLists.txt index 80e3ab8f8d..98706ad271 100644 --- a/examples/msg/energy/pstate/CMakeLists.txt +++ b/examples/msg/energy/pstate/CMakeLists.txt @@ -1,9 +1,5 @@ -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - -add_executable(pstate pstate.c) - -### Add definitions for compile -target_link_libraries(pstate simgrid ) +add_executable (pstate pstate.c) +target_link_libraries(pstate simgrid) set(tesh_files ${tesh_files} diff --git a/examples/msg/energy/vm/CMakeLists.txt b/examples/msg/energy/vm/CMakeLists.txt index f0451c9ab6..982bc54eb7 100644 --- a/examples/msg/energy/vm/CMakeLists.txt +++ b/examples/msg/energy/vm/CMakeLists.txt @@ -1,8 +1,4 @@ -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - -add_executable(energy_vm energy_vm.c) - -### Add definitions for compile +add_executable (energy_vm energy_vm.c) target_link_libraries(energy_vm simgrid) set(tesh_files diff --git a/examples/msg/exception/CMakeLists.txt b/examples/msg/exception/CMakeLists.txt index ba40be2811..229288ef3c 100644 --- a/examples/msg/exception/CMakeLists.txt +++ b/examples/msg/exception/CMakeLists.txt @@ -1,8 +1,4 @@ -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - -add_executable(exception exception.c) - -### Add definitions for compile +add_executable (exception exception.c) target_link_libraries(exception simgrid) set(tesh_files diff --git a/examples/msg/gpu/CMakeLists.txt b/examples/msg/gpu/CMakeLists.txt index f5e9f7745a..eb137cf86a 100644 --- a/examples/msg/gpu/CMakeLists.txt +++ b/examples/msg/gpu/CMakeLists.txt @@ -1,23 +1,7 @@ -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") +add_executable (test_MSG_gpu_task_create test_MSG_gpu_task_create.c) +target_link_libraries(test_MSG_gpu_task_create simgrid) -add_executable(test_MSG_gpu_task_create "test_MSG_gpu_task_create.c") - -### Add definitions for compile -target_link_libraries(test_MSG_gpu_task_create simgrid ) - -set(tesh_files - ${tesh_files} - PARENT_SCOPE) -set(xml_files - ${xml_files} - PARENT_SCOPE) set(examples_src ${examples_src} ${CMAKE_CURRENT_SOURCE_DIR}/test_MSG_gpu_task_create.c PARENT_SCOPE) -set(bin_files - ${bin_files} - PARENT_SCOPE) -set(txt_files - ${txt_files} - PARENT_SCOPE) diff --git a/examples/msg/gtnets/CMakeLists.txt b/examples/msg/gtnets/CMakeLists.txt index e1f1c492eb..9f6fe78b27 100644 --- a/examples/msg/gtnets/CMakeLists.txt +++ b/examples/msg/gtnets/CMakeLists.txt @@ -1,8 +1,4 @@ -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - -add_executable(gtnets gtnets.c) - -### Add definitions for compile +add_executable (gtnets gtnets.c) target_link_libraries(gtnets simgrid) set(tesh_files diff --git a/examples/msg/icomms/CMakeLists.txt b/examples/msg/icomms/CMakeLists.txt index af87b61430..306390f100 100644 --- a/examples/msg/icomms/CMakeLists.txt +++ b/examples/msg/icomms/CMakeLists.txt @@ -1,12 +1,8 @@ -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - -add_executable(peer peer.c) -target_link_libraries(peer simgrid) - -add_executable(peer2 peer2.c) +add_executable (peer peer.c) +target_link_libraries(peer simgrid) +add_executable (peer2 peer2.c) target_link_libraries(peer2 simgrid) - -add_executable(peer3 peer3.c) +add_executable (peer3 peer3.c) target_link_libraries(peer3 simgrid) set(tesh_files diff --git a/examples/msg/io/CMakeLists.txt b/examples/msg/io/CMakeLists.txt index 558580ccac..c21e18de7c 100644 --- a/examples/msg/io/CMakeLists.txt +++ b/examples/msg/io/CMakeLists.txt @@ -1,22 +1,11 @@ -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - -add_executable(file file.c) -add_executable(file_unlink file_unlink.c) -add_executable(storage storage.c) -add_executable(remote remote.c) - -### Add definitions for compile -if(NOT WIN32) - target_link_libraries(file simgrid pthread) - target_link_libraries(file_unlink simgrid pthread) - target_link_libraries(remote simgrid pthread) - target_link_libraries(storage simgrid pthread) -else() - target_link_libraries(file simgrid) - target_link_libraries(file_unlink simgrid) - target_link_libraries(remote simgrid) - target_link_libraries(storage simgrid) -endif() +add_executable (file file.c) +target_link_libraries(file simgrid) +add_executable (file_unlink file_unlink.c) +target_link_libraries(file_unlink simgrid) +add_executable (storage storage.c) +target_link_libraries(storage simgrid) +add_executable (remote remote.c) +target_link_libraries(remote simgrid) set(tesh_files ${tesh_files} diff --git a/examples/msg/kademlia/CMakeLists.txt b/examples/msg/kademlia/CMakeLists.txt index fd295b5c64..c7e8dccc22 100644 --- a/examples/msg/kademlia/CMakeLists.txt +++ b/examples/msg/kademlia/CMakeLists.txt @@ -1,8 +1,5 @@ -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - -add_executable(kademlia "kademlia.c" "node.c" "routing_table.c" "task.c" "answer.c") -### Add definitions for compile -target_link_libraries(kademlia simgrid ) +add_executable (kademlia kademlia.c node.c routing_table.c task.c answer.c) +target_link_libraries(kademlia simgrid) set(tesh_files ${tesh_files} diff --git a/examples/msg/masterslave/CMakeLists.txt b/examples/msg/masterslave/CMakeLists.txt index 8e54c3e973..bd7a720eb4 100644 --- a/examples/msg/masterslave/CMakeLists.txt +++ b/examples/msg/masterslave/CMakeLists.txt @@ -1,16 +1,13 @@ -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - -add_executable(masterslave_failure "masterslave_failure.c") -add_executable(masterslave_forwarder "masterslave_forwarder.c") -add_executable(masterslave_mailbox "masterslave_mailbox.c") -add_executable(masterslave_kill "masterslave_kill.c") -add_executable(masterslave_arg "masterslave_arg.c") - +add_executable (masterslave_failure masterslave_failure.c) +target_link_libraries(masterslave_failure simgrid) +add_executable (masterslave_forwarder masterslave_forwarder.c) target_link_libraries(masterslave_forwarder simgrid ) -target_link_libraries(masterslave_failure simgrid ) -target_link_libraries(masterslave_mailbox simgrid ) -target_link_libraries(masterslave_kill simgrid ) -target_link_libraries(masterslave_arg simgrid ) +add_executable (masterslave_mailbox masterslave_mailbox.c) +target_link_libraries(masterslave_mailbox simgrid) +add_executable (masterslave_kill masterslave_kill.c) +target_link_libraries(masterslave_kill simgrid) +add_executable (masterslave_arg masterslave_arg.c) +target_link_libraries(masterslave_arg simgrid) set(tesh_files ${tesh_files} diff --git a/examples/msg/mc/CMakeLists.txt b/examples/msg/mc/CMakeLists.txt index 4361496e43..c3b72684d6 100644 --- a/examples/msg/mc/CMakeLists.txt +++ b/examples/msg/mc/CMakeLists.txt @@ -1,30 +1,26 @@ if(HAVE_MC) - set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - - add_executable(centralized centralized_mutex.c) - add_executable(bugged1 bugged1.c) - add_executable(bugged2 bugged2.c) - add_executable(bugged3 bugged3.c) - add_executable(electric_fence electric_fence.c) - add_executable(bugged1_liveness bugged1_liveness.c) - add_executable(bugged2_liveness bugged2_liveness.c) - - target_link_libraries(centralized simgrid ) - target_link_libraries(bugged1 simgrid ) - target_link_libraries(bugged2 simgrid ) - target_link_libraries(bugged3 simgrid ) - target_link_libraries(electric_fence simgrid ) - target_link_libraries(bugged1_liveness simgrid ) - target_link_libraries(bugged2_liveness simgrid ) + add_executable (centralized centralized_mutex.c) + target_link_libraries(centralized simgrid) + add_executable (bugged1 bugged1.c) + target_link_libraries(bugged1 simgrid) + add_executable (bugged2 bugged2.c) + target_link_libraries(bugged2 simgrid) + add_executable (bugged3 bugged3.c) + target_link_libraries(bugged3 simgrid) + add_executable (electric_fence electric_fence.c) + target_link_libraries(electric_fence simgrid) + add_executable (bugged1_liveness bugged1_liveness.c) + target_link_libraries(bugged1_liveness simgrid) + add_executable (bugged2_liveness bugged2_liveness.c) + target_link_libraries(bugged2_liveness simgrid) if(HAVE_C_STACK_CLEANER) - add_executable(bugged1_liveness_cleaner_on bugged1_liveness.c ) - add_executable(bugged1_liveness_cleaner_off bugged1_liveness.c ) - - target_link_libraries(bugged1_liveness_cleaner_on simgrid ) - target_link_libraries(bugged1_liveness_cleaner_off simgrid ) - + add_executable (bugged1_liveness_cleaner_on bugged1_liveness.c) + target_link_libraries(bugged1_liveness_cleaner_on simgrid) set_target_properties(bugged1_liveness_cleaner_on PROPERTIES COMPILE_FLAGS "-DGARBAGE_STACK -fstack-cleaner") + + add_executable (bugged1_liveness_cleaner_off bugged1_liveness.c) + target_link_libraries(bugged1_liveness_cleaner_off simgrid) set_target_properties(bugged1_liveness_cleaner_off PROPERTIES COMPILE_FLAGS "-DGARBAGE_STACK -fno-stack-cleaner") endif() endif() diff --git a/examples/msg/migration/CMakeLists.txt b/examples/msg/migration/CMakeLists.txt index ea96ff4db1..fbb9b8c10d 100644 --- a/examples/msg/migration/CMakeLists.txt +++ b/examples/msg/migration/CMakeLists.txt @@ -1,7 +1,5 @@ -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - -add_executable(migration migration.c) -target_link_libraries(migration simgrid ) +add_executable (migration migration.c) +target_link_libraries(migration simgrid) set(tesh_files ${tesh_files} diff --git a/examples/msg/ns3/CMakeLists.txt b/examples/msg/ns3/CMakeLists.txt index fd2349b93c..9765d82289 100644 --- a/examples/msg/ns3/CMakeLists.txt +++ b/examples/msg/ns3/CMakeLists.txt @@ -1,7 +1,6 @@ if(HAVE_NS3) - set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - add_executable(ns3 "ns3.c") - target_link_libraries(ns3 simgrid ) + add_executable (ns3 ns3.c) + target_link_libraries(ns3 simgrid) endif() set(tesh_files diff --git a/examples/msg/parallel_task/CMakeLists.txt b/examples/msg/parallel_task/CMakeLists.txt index d993ee41e4..9928fd2f97 100644 --- a/examples/msg/parallel_task/CMakeLists.txt +++ b/examples/msg/parallel_task/CMakeLists.txt @@ -1,7 +1,5 @@ -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - -add_executable(parallel_task parallel_task.c) -target_link_libraries(parallel_task simgrid ) +add_executable (parallel_task parallel_task.c) +target_link_libraries(parallel_task simgrid) set(tesh_files ${tesh_files} diff --git a/examples/msg/pastry/CMakeLists.txt b/examples/msg/pastry/CMakeLists.txt index b071ef5269..3bd6d385ff 100644 --- a/examples/msg/pastry/CMakeLists.txt +++ b/examples/msg/pastry/CMakeLists.txt @@ -1,7 +1,5 @@ -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - -add_executable(pastry pastry.c) -target_link_libraries(pastry simgrid ) +add_executable (pastry pastry.c) +target_link_libraries(pastry simgrid) set(tesh_files ${tesh_files} diff --git a/examples/msg/pmm/CMakeLists.txt b/examples/msg/pmm/CMakeLists.txt index c28e6896fd..330bf98f4a 100644 --- a/examples/msg/pmm/CMakeLists.txt +++ b/examples/msg/pmm/CMakeLists.txt @@ -1,7 +1,5 @@ -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - -add_executable(msg_pmm msg_pmm.c) -target_link_libraries(msg_pmm simgrid ) +add_executable (msg_pmm msg_pmm.c) +target_link_libraries(msg_pmm simgrid) set(tesh_files ${tesh_files} diff --git a/examples/msg/priority/CMakeLists.txt b/examples/msg/priority/CMakeLists.txt index 298eeef7d3..a1e0d3d0e7 100644 --- a/examples/msg/priority/CMakeLists.txt +++ b/examples/msg/priority/CMakeLists.txt @@ -1,6 +1,4 @@ -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - -add_executable(priority priority.c) +add_executable (priority priority.c) target_link_libraries(priority simgrid) set(tesh_files diff --git a/examples/msg/properties/CMakeLists.txt b/examples/msg/properties/CMakeLists.txt index 1c70616da0..7a047e128d 100644 --- a/examples/msg/properties/CMakeLists.txt +++ b/examples/msg/properties/CMakeLists.txt @@ -1,6 +1,4 @@ -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - -add_executable(msg_prop msg_prop.c) +add_executable (msg_prop msg_prop.c) target_link_libraries(msg_prop simgrid) set(tesh_files diff --git a/examples/msg/semaphores/CMakeLists.txt b/examples/msg/semaphores/CMakeLists.txt index fd337d85f5..17c46293ef 100644 --- a/examples/msg/semaphores/CMakeLists.txt +++ b/examples/msg/semaphores/CMakeLists.txt @@ -1,6 +1,4 @@ -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - -add_executable(synchro synchro.c) +add_executable (synchro synchro.c) target_link_libraries(synchro simgrid) set(tesh_files diff --git a/examples/msg/sendrecv/CMakeLists.txt b/examples/msg/sendrecv/CMakeLists.txt index 2f225fc50d..d9597ccaa7 100644 --- a/examples/msg/sendrecv/CMakeLists.txt +++ b/examples/msg/sendrecv/CMakeLists.txt @@ -1,11 +1,7 @@ -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - -add_executable(sendrecv sendrecv.c) -add_executable(sendrecv_main sendrecv_main.c) - -### Add definitions for compile -target_link_libraries(sendrecv simgrid ) -target_link_libraries(sendrecv_main simgrid ) +add_executable (sendrecv sendrecv.c) +target_link_libraries(sendrecv simgrid) +add_executable (sendrecv_main sendrecv_main.c) +target_link_libraries(sendrecv_main simgrid) set(tesh_files ${tesh_files} diff --git a/examples/msg/start_kill_time/CMakeLists.txt b/examples/msg/start_kill_time/CMakeLists.txt index bae4251717..37d306950d 100644 --- a/examples/msg/start_kill_time/CMakeLists.txt +++ b/examples/msg/start_kill_time/CMakeLists.txt @@ -1,7 +1,5 @@ -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - -add_executable(sk_time "sk_time.c") -target_link_libraries(sk_time simgrid ) +add_executable (sk_time sk_time.c) +target_link_libraries(sk_time simgrid) set(tesh_files ${tesh_files} diff --git a/examples/msg/suspend/CMakeLists.txt b/examples/msg/suspend/CMakeLists.txt index 9126d3883c..119df72d8d 100644 --- a/examples/msg/suspend/CMakeLists.txt +++ b/examples/msg/suspend/CMakeLists.txt @@ -1,7 +1,5 @@ -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - -add_executable(suspend suspend.c) -target_link_libraries(suspend simgrid ) +add_executable (suspend suspend.c) +target_link_libraries(suspend simgrid) set(tesh_files ${tesh_files} diff --git a/examples/msg/token_ring/CMakeLists.txt b/examples/msg/token_ring/CMakeLists.txt index 75f915120d..26d0fcb7f7 100644 --- a/examples/msg/token_ring/CMakeLists.txt +++ b/examples/msg/token_ring/CMakeLists.txt @@ -1,13 +1,5 @@ -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - -add_executable(token_ring ring_call.c) - -### Add definitions for compile -if(NOT WIN32) - target_link_libraries(token_ring simgrid pthread ) -else() - target_link_libraries(token_ring simgrid) -endif() +add_executable (token_ring ring_call.c) +target_link_libraries(token_ring simgrid) set(tesh_files ${tesh_files} diff --git a/examples/msg/tracing/CMakeLists.txt b/examples/msg/tracing/CMakeLists.txt index 8cdba72b6c..4711217947 100644 --- a/examples/msg/tracing/CMakeLists.txt +++ b/examples/msg/tracing/CMakeLists.txt @@ -1,23 +1,19 @@ -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") -set(LIBRARY_OUTPUT_PATH "${CMAKE_HOME_DIRECTORY}/lib") - -add_executable(ms ${CMAKE_CURRENT_SOURCE_DIR}/ms.c) -add_executable(categories ${CMAKE_CURRENT_SOURCE_DIR}/categories.c) -add_executable(procmig ${CMAKE_CURRENT_SOURCE_DIR}/procmig.c) -add_executable(simple ${CMAKE_CURRENT_SOURCE_DIR}/simple.c) -add_executable(trace_platform ${CMAKE_CURRENT_SOURCE_DIR}/trace_platform.c) -add_executable(user_variables ${CMAKE_CURRENT_SOURCE_DIR}/user_variables.c) -add_executable(link_user_variables ${CMAKE_CURRENT_SOURCE_DIR}/link_user_variables.c) -add_executable(link_srcdst_user_variables ${CMAKE_CURRENT_SOURCE_DIR}/link_srcdst_user_variables.c) - -target_link_libraries(ms simgrid ) -target_link_libraries(categories simgrid ) -target_link_libraries(procmig simgrid ) -target_link_libraries(simple simgrid ) -target_link_libraries(trace_platform simgrid ) -target_link_libraries(user_variables simgrid ) -target_link_libraries(link_user_variables simgrid ) -target_link_libraries(link_srcdst_user_variables simgrid ) +add_executable (ms ms.c) +target_link_libraries(ms simgrid) +add_executable (categories categories.c) +target_link_libraries(categories simgrid) +add_executable (procmig procmig.c) +target_link_libraries(procmig simgrid) +add_executable (simple simple.c) +target_link_libraries(simple simgrid) +add_executable (trace_platform trace_platform.c) +target_link_libraries(trace_platform simgrid) +add_executable (user_variables user_variables.c) +target_link_libraries(user_variables simgrid) +add_executable (link_user_variables link_user_variables.c) +target_link_libraries(link_user_variables simgrid) +add_executable (link_srcdst_user_variables link_srcdst_user_variables.c) +target_link_libraries(link_srcdst_user_variables simgrid) ## Clean generated files get_directory_property(extra_clean_files ADDITIONAL_MAKE_CLEAN_FILES) diff --git a/examples/s4u/README b/examples/s4u/README index 0b547154cd..48f7ff46bf 100644 --- a/examples/s4u/README +++ b/examples/s4u/README @@ -2,6 +2,6 @@ S4U (Simgrid for you) is the next interface of SimGrid, expected to be released with SimGrid 4.0. Even if it's in a very preliminary state so far, you are welcome to -try it an report any interface glitches that you see. Be however +try it and report any interface glitches that you see. Be however warned that the interface will be modified until its final release. You will have to adapt your code on the way. \ No newline at end of file diff --git a/examples/s4u/basic/CMakeLists.txt b/examples/s4u/basic/CMakeLists.txt index 5d2c207bc6..272b30207f 100644 --- a/examples/s4u/basic/CMakeLists.txt +++ b/examples/s4u/basic/CMakeLists.txt @@ -1,5 +1,4 @@ -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") -add_executable(s4u_basic s4u_basic.cpp) +add_executable (s4u_basic s4u_basic.cpp) target_link_libraries(s4u_basic simgrid) set(tesh_files diff --git a/examples/s4u/io/CMakeLists.txt b/examples/s4u/io/CMakeLists.txt index 7fdeb48f56..d61f16b6ce 100644 --- a/examples/s4u/io/CMakeLists.txt +++ b/examples/s4u/io/CMakeLists.txt @@ -1,5 +1,4 @@ -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") -add_executable(s4u_io_test ${CMAKE_CURRENT_SOURCE_DIR}/s4u_io_test.cpp) +add_executable (s4u_io_test s4u_io_test.cpp) target_link_libraries(s4u_io_test simgrid) set(tesh_files diff --git a/examples/simdag/CMakeLists.txt b/examples/simdag/CMakeLists.txt index bd57c5b78c..126e7f5c74 100644 --- a/examples/simdag/CMakeLists.txt +++ b/examples/simdag/CMakeLists.txt @@ -1,18 +1,15 @@ -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - -add_executable(sd_test sd_test.c) -add_executable(sd_test2 sd_test2.c) -add_executable(sd_fail sd_fail.c) -add_executable(sd_avail sd_avail.c) -add_executable(sd_typed_tasks_test sd_typed_tasks_test.c) -add_executable(sd_comm_throttling sd_comm_throttling.c) - -target_link_libraries(sd_test simgrid) -target_link_libraries(sd_test2 simgrid) -target_link_libraries(sd_fail simgrid) -target_link_libraries(sd_avail simgrid) +add_executable (sd_test sd_test.c) +target_link_libraries(sd_test simgrid) +add_executable (sd_test2 sd_test2.c) +target_link_libraries(sd_test2 simgrid) +add_executable (sd_fail sd_fail.c) +target_link_libraries(sd_fail simgrid) +add_executable (sd_avail sd_avail.c) +target_link_libraries(sd_avail simgrid) +add_executable (sd_typed_tasks_test sd_typed_tasks_test.c) target_link_libraries(sd_typed_tasks_test simgrid) -target_link_libraries(sd_comm_throttling simgrid) +add_executable (sd_comm_throttling sd_comm_throttling.c) +target_link_libraries(sd_comm_throttling simgrid) set(tesh_files ${tesh_files} diff --git a/examples/simdag/dax/CMakeLists.txt b/examples/simdag/dax/CMakeLists.txt index 77dafa09b7..bac344e924 100644 --- a/examples/simdag/dax/CMakeLists.txt +++ b/examples/simdag/dax/CMakeLists.txt @@ -1,6 +1,4 @@ -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - -add_executable(dax_test dax_test.c) +add_executable (dax_test dax_test.c) target_link_libraries(dax_test simgrid) set(tesh_files diff --git a/examples/simdag/dot/CMakeLists.txt b/examples/simdag/dot/CMakeLists.txt index c45b57cd33..9e81450518 100644 --- a/examples/simdag/dot/CMakeLists.txt +++ b/examples/simdag/dot/CMakeLists.txt @@ -1,15 +1,12 @@ if(HAVE_GRAPHVIZ) - set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - - add_executable(dot_test dot_test.c) - add_executable(ptg_test ptg_test.c) - add_executable(simulate_dot simulate_dot.c) - add_executable(dot_test2 dot_test2.c) - - target_link_libraries(dot_test simgrid) - target_link_libraries(ptg_test simgrid) + add_executable (dot_test dot_test.c) + target_link_libraries(dot_test simgrid) + add_executable (ptg_test ptg_test.c) + target_link_libraries(ptg_test simgrid) + add_executable (simulate_dot simulate_dot.c) target_link_libraries(simulate_dot simgrid) - target_link_libraries(dot_test2 simgrid) + add_executable (dot_test2 dot_test2.c) + target_link_libraries(dot_test2 simgrid) endif() set(tesh_files diff --git a/examples/simdag/goal/CMakeLists.txt b/examples/simdag/goal/CMakeLists.txt index d0f13f5f20..2887013e70 100644 --- a/examples/simdag/goal/CMakeLists.txt +++ b/examples/simdag/goal/CMakeLists.txt @@ -1,6 +1,4 @@ -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - -add_executable(goal_test goal_test.c) +add_executable (goal_test goal_test.c) target_link_libraries(goal_test simgrid) set(examples_src diff --git a/examples/simdag/io/CMakeLists.txt b/examples/simdag/io/CMakeLists.txt index 3f4db61446..f1e63b1ee2 100644 --- a/examples/simdag/io/CMakeLists.txt +++ b/examples/simdag/io/CMakeLists.txt @@ -1,6 +1,4 @@ -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - -add_executable(sd_io sd_io.c) +add_executable (sd_io sd_io.c) target_link_libraries(sd_io simgrid) set(tesh_files diff --git a/examples/simdag/properties/CMakeLists.txt b/examples/simdag/properties/CMakeLists.txt index e0fc82d56b..892fff8341 100644 --- a/examples/simdag/properties/CMakeLists.txt +++ b/examples/simdag/properties/CMakeLists.txt @@ -1,6 +1,4 @@ -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - -add_executable(sd_prop sd_prop.c) +add_executable (sd_prop sd_prop.c) target_link_libraries(sd_prop simgrid) set(tesh_files diff --git a/examples/simdag/scheduling/CMakeLists.txt b/examples/simdag/scheduling/CMakeLists.txt index 219282d9e8..70d8da4f9f 100644 --- a/examples/simdag/scheduling/CMakeLists.txt +++ b/examples/simdag/scheduling/CMakeLists.txt @@ -1,6 +1,4 @@ -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - -add_executable(minmin_test minmin_test.c) +add_executable (minmin_test minmin_test.c) target_link_libraries(minmin_test simgrid) set(tesh_files diff --git a/examples/smpi/CMakeLists.txt b/examples/smpi/CMakeLists.txt index 6476a6b445..9f1788a0e4 100644 --- a/examples/smpi/CMakeLists.txt +++ b/examples/smpi/CMakeLists.txt @@ -5,53 +5,26 @@ if(enable_smpi) set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") endif() - set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/mc/") - add_executable(bcbench bcbench.c) - add_executable(mvmul mvmul.c) - add_executable(smpi_traced tracing/smpi_traced.c) - add_executable(smpi_traced_simple tracing/smpi_traced_simple.c) - add_executable(smpi_replay replay/replay.c) - - target_link_libraries(bcbench simgrid) - target_link_libraries(mvmul simgrid) - target_link_libraries(smpi_traced simgrid) + add_executable (bcbench bcbench.c) + target_link_libraries(bcbench simgrid) + add_executable (mvmul mvmul.c) + target_link_libraries(mvmul simgrid) + add_executable (smpi_traced tracing/smpi_traced.c) + target_link_libraries(smpi_traced simgrid) + add_executable (smpi_traced_simple tracing/smpi_traced_simple.c) target_link_libraries(smpi_traced_simple simgrid) - target_link_libraries(smpi_replay simgrid) + add_executable (smpi_replay replay/replay.c) + target_link_libraries(smpi_replay simgrid) if(HAVE_MC) - add_executable(smpi_bugged1 mc/bugged1.c) - add_executable(smpi_bugged2 mc/bugged2.c) - add_executable(smpi_bugged1_liveness mc/bugged1_liveness.c) - add_executable(smpi_only_send_deterministic mc/only_send_deterministic.c) - add_executable(smpi_mutual_exclusion mc/mutual_exclusion.c) - add_executable(smpi_non_termination1 mc/non_termination1.c) - add_executable(smpi_non_termination2 mc/non_termination2.c) - add_executable(smpi_non_termination3 mc/non_termination3.c) - add_executable(smpi_non_termination4 mc/non_termination4.c) - - target_link_libraries(smpi_bugged1 simgrid) - target_link_libraries(smpi_bugged2 simgrid) - target_link_libraries(smpi_bugged1_liveness simgrid) - target_link_libraries(smpi_only_send_deterministic simgrid) - target_link_libraries(smpi_mutual_exclusion simgrid) - target_link_libraries(smpi_non_termination1 simgrid) - target_link_libraries(smpi_non_termination2 simgrid) - target_link_libraries(smpi_non_termination3 simgrid) - target_link_libraries(smpi_non_termination4 simgrid) - - set_target_properties(smpi_bugged1 PROPERTIES RUNTIME_OUTPUT_DIRECTORY "./mc") - set_target_properties(smpi_bugged2 PROPERTIES RUNTIME_OUTPUT_DIRECTORY "./mc") - set_target_properties(smpi_bugged1_liveness PROPERTIES RUNTIME_OUTPUT_DIRECTORY "./mc") - set_target_properties(smpi_only_send_deterministic PROPERTIES RUNTIME_OUTPUT_DIRECTORY "./mc") - set_target_properties(smpi_mutual_exclusion PROPERTIES RUNTIME_OUTPUT_DIRECTORY "./mc") - set_target_properties(smpi_non_termination1 PROPERTIES RUNTIME_OUTPUT_DIRECTORY "./mc") - set_target_properties(smpi_non_termination2 PROPERTIES RUNTIME_OUTPUT_DIRECTORY "./mc") - set_target_properties(smpi_non_termination3 PROPERTIES RUNTIME_OUTPUT_DIRECTORY "./mc") - set_target_properties(smpi_non_termination4 PROPERTIES RUNTIME_OUTPUT_DIRECTORY "./mc") + foreach(x bugged1 bugged2 bugged1_liveness only_send_deterministic mutual_exclusion non_termination1 non_termination2 non_termination3 non_termination4) + add_executable (smpi_${x} mc/${x}.c) + target_link_libraries(smpi_${x} simgrid) + set_target_properties(smpi_${x} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "./mc") + endforeach() endif() endif() diff --git a/examples/smpi/MM/CMakeLists.txt b/examples/smpi/MM/CMakeLists.txt index ec352cc7b3..4438eec075 100644 --- a/examples/smpi/MM/CMakeLists.txt +++ b/examples/smpi/MM/CMakeLists.txt @@ -1,11 +1,10 @@ if(enable_smpi) set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") - set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") if(NOT WIN32) - add_executable(MM_mpi MM_mpi.c 2.5D_MM.c Summa.c Matrix_init.c) - target_link_libraries(MM_mpi simgrid pthread) + add_executable (MM_mpi MM_mpi.c 2.5D_MM.c Summa.c Matrix_init.c) + target_link_libraries(MM_mpi simgrid) endif() endif() diff --git a/examples/smpi/energy/CMakeLists.txt b/examples/smpi/energy/CMakeLists.txt index c77983eab8..53714232c8 100644 --- a/examples/smpi/energy/CMakeLists.txt +++ b/examples/smpi/energy/CMakeLists.txt @@ -4,11 +4,9 @@ if(enable_smpi) else() set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") endif() - - set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") - add_executable(se se.c) + add_executable (se se.c) target_link_libraries(se simgrid) endif() diff --git a/examples/smpi/energy/f77/CMakeLists.txt b/examples/smpi/energy/f77/CMakeLists.txt index 976640d2af..3b503c4c18 100644 --- a/examples/smpi/energy/f77/CMakeLists.txt +++ b/examples/smpi/energy/f77/CMakeLists.txt @@ -1,8 +1,7 @@ if(enable_smpi AND SMPI_FORTRAN) set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpiff") - set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - add_executable(sef sef.f) + add_executable (sef sef.f) target_link_libraries(sef simgrid) endif() diff --git a/examples/smpi/energy/f90/CMakeLists.txt b/examples/smpi/energy/f90/CMakeLists.txt index b96c097135..d604ad668a 100644 --- a/examples/smpi/energy/f90/CMakeLists.txt +++ b/examples/smpi/energy/f90/CMakeLists.txt @@ -1,8 +1,7 @@ if(enable_smpi AND SMPI_FORTRAN) set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpif90") - set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - add_executable(sef90 sef90.f90) + add_executable (sef90 sef90.f90) target_link_libraries(sef90 simgrid) endif() diff --git a/examples/smpi/replay_multiple/CMakeLists.txt b/examples/smpi/replay_multiple/CMakeLists.txt index 601ce272af..cd9186c437 100644 --- a/examples/smpi/replay_multiple/CMakeLists.txt +++ b/examples/smpi/replay_multiple/CMakeLists.txt @@ -1,8 +1,7 @@ if(enable_smpi) - set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") - add_executable(replay_multiple replay_multiple.c) + add_executable (replay_multiple replay_multiple.c) target_link_libraries(replay_multiple simgrid) endif() diff --git a/examples/smpi/smpi_msg_masterslave/CMakeLists.txt b/examples/smpi/smpi_msg_masterslave/CMakeLists.txt index 787fd2875f..62fee2c1e0 100644 --- a/examples/smpi/smpi_msg_masterslave/CMakeLists.txt +++ b/examples/smpi/smpi_msg_masterslave/CMakeLists.txt @@ -1,8 +1,7 @@ if(enable_smpi) - set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") - add_executable(masterslave_mailbox_smpi masterslave_mailbox_smpi.c) + add_executable (masterslave_mailbox_smpi masterslave_mailbox_smpi.c) target_link_libraries(masterslave_mailbox_smpi simgrid) endif() diff --git a/src/surf/xml/simgrid_dtd.c b/src/surf/xml/simgrid_dtd.c index c8b3eee312..98e7e1c034 100644 --- a/src/surf/xml/simgrid_dtd.c +++ b/src/surf/xml/simgrid_dtd.c @@ -6037,8 +6037,8 @@ YY_RULE_SETUP if (!AX_surfxml_ASroute_src) FAIL("Required attribute `src' not set for `ASroute' element."); LEAVE; STag_surfxml_ASroute(); surfxml_pcdata_ix = 0; ETag_surfxml_ASroute(); popbuffer(); /* attribute */ switch (YY_START) { - case S_surfxml_AS_3: case S_surfxml_AS_5: case S_surfxml_AS_6: SET(S_surfxml_AS_6); break; - case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_4: case S_surfxml_AS_7: case S_surfxml_AS_8: SET(S_surfxml_AS_8); break; + case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_5: SET(S_surfxml_AS_6); break; + case S_surfxml_AS_4: case S_surfxml_AS_6: case S_surfxml_AS_7: case S_surfxml_AS_8: SET(S_surfxml_AS_8); break; } } YY_BREAK @@ -6062,8 +6062,8 @@ YY_RULE_SETUP ETag_surfxml_ASroute(); popbuffer(); /* attribute */ switch (YY_START) { - case S_surfxml_AS_3: case S_surfxml_AS_5: case S_surfxml_AS_6: SET(S_surfxml_AS_6); break; - case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_4: case S_surfxml_AS_7: case S_surfxml_AS_8: SET(S_surfxml_AS_8); break; + case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_5: SET(S_surfxml_AS_6); break; + case S_surfxml_AS_4: case S_surfxml_AS_6: case S_surfxml_AS_7: case S_surfxml_AS_8: SET(S_surfxml_AS_8); break; } } YY_BREAK diff --git a/teshsuite/bug-17132/CMakeLists.txt b/teshsuite/bug-17132/CMakeLists.txt index 52477955a5..84e79b1435 100644 --- a/teshsuite/bug-17132/CMakeLists.txt +++ b/teshsuite/bug-17132/CMakeLists.txt @@ -4,11 +4,9 @@ if(enable_smpi) else() set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") endif() - - set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") - add_executable(bug-17132 ${CMAKE_HOME_DIRECTORY}/teshsuite/bug-17132/bug-17132.c) + + add_executable (bug-17132 bug-17132.c) target_link_libraries(bug-17132 simgrid) endif(enable_smpi) diff --git a/teshsuite/java/semaphore/CMakeLists.txt b/teshsuite/java/semaphore/CMakeLists.txt index 1469e80fa9..13fdffc667 100644 --- a/teshsuite/java/semaphore/CMakeLists.txt +++ b/teshsuite/java/semaphore/CMakeLists.txt @@ -1,7 +1,5 @@ set(example java_semaphore_gc) -set(sources - ${CMAKE_CURRENT_SOURCE_DIR}/SemaphoreGC.java - ) +set(sources SemaphoreGC.java) if(enable_java) add_custom_command( diff --git a/teshsuite/java/sleep_host_off/CMakeLists.txt b/teshsuite/java/sleep_host_off/CMakeLists.txt index 5f3db60c12..5ab4ad8fa6 100644 --- a/teshsuite/java/sleep_host_off/CMakeLists.txt +++ b/teshsuite/java/sleep_host_off/CMakeLists.txt @@ -1,7 +1,5 @@ set(example java_sleep_host_off) -set(sources - ${CMAKE_CURRENT_SOURCE_DIR}/SleepHostOff.java - ) +set(sources SleepHostOff.java) if(enable_java) add_custom_command( diff --git a/teshsuite/mc/CMakeLists.txt b/teshsuite/mc/CMakeLists.txt index 73d251ea0b..6a38e8b872 100644 --- a/teshsuite/mc/CMakeLists.txt +++ b/teshsuite/mc/CMakeLists.txt @@ -1,11 +1,7 @@ -if(HAVE_MC) - set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") -endif() +add_executable (with_mutex_handling mutex_handling.c) +target_link_libraries(with_mutex_handling simgrid) -add_executable(with_mutex_handling mutex_handling.c) -target_link_libraries(with_mutex_handling simgrid) - -add_executable(without_mutex_handling mutex_handling.c) +add_executable (without_mutex_handling mutex_handling.c) target_link_libraries(without_mutex_handling simgrid) set_target_properties(without_mutex_handling PROPERTIES COMPILE_FLAGS -DDISABLE_THE_MUTEX=1) diff --git a/teshsuite/mc/dwarf/CMakeLists.txt b/teshsuite/mc/dwarf/CMakeLists.txt index 7edcfc5fee..904cafbf46 100644 --- a/teshsuite/mc/dwarf/CMakeLists.txt +++ b/teshsuite/mc/dwarf/CMakeLists.txt @@ -1,7 +1,5 @@ if(HAVE_MC) - set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - - add_executable(dwarf dwarf.cpp) + add_executable (dwarf dwarf.cpp) target_link_libraries(dwarf simgrid) endif() diff --git a/teshsuite/mc/dwarf_expression/CMakeLists.txt b/teshsuite/mc/dwarf_expression/CMakeLists.txt index ce37b276e8..e17889ea4c 100644 --- a/teshsuite/mc/dwarf_expression/CMakeLists.txt +++ b/teshsuite/mc/dwarf_expression/CMakeLists.txt @@ -1,7 +1,5 @@ if(HAVE_MC) - set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - - add_executable(dwarf-expression dwarf_expression.cpp) + add_executable (dwarf-expression dwarf_expression.cpp) target_link_libraries(dwarf-expression simgrid) endif() diff --git a/teshsuite/mc/replay/CMakeLists.txt b/teshsuite/mc/replay/CMakeLists.txt index e768581699..9bfb7ad2a3 100644 --- a/teshsuite/mc/replay/CMakeLists.txt +++ b/teshsuite/mc/replay/CMakeLists.txt @@ -1,5 +1,4 @@ -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") -add_executable(random_bug random_bug.c) +add_executable (random_bug random_bug.c) target_link_libraries(random_bug simgrid) set(tesh_files diff --git a/teshsuite/msg/get_sender/CMakeLists.txt b/teshsuite/msg/get_sender/CMakeLists.txt index 7141cba139..d4cef67338 100644 --- a/teshsuite/msg/get_sender/CMakeLists.txt +++ b/teshsuite/msg/get_sender/CMakeLists.txt @@ -1,6 +1,4 @@ -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - -add_executable(get_sender get_sender.c) +add_executable (get_sender get_sender.c) target_link_libraries(get_sender simgrid) set(tesh_files diff --git a/teshsuite/msg/host_on_off/CMakeLists.txt b/teshsuite/msg/host_on_off/CMakeLists.txt index 776a8116af..2f60d1ea39 100644 --- a/teshsuite/msg/host_on_off/CMakeLists.txt +++ b/teshsuite/msg/host_on_off/CMakeLists.txt @@ -1,7 +1,5 @@ -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - foreach(x host_on_off host_on_off_wait host_on_off_recv) - add_executable(${x} ${x}.c) + add_executable (${x} ${x}.c) target_link_libraries(${x} simgrid) endforeach() diff --git a/teshsuite/msg/host_on_off_processes/CMakeLists.txt b/teshsuite/msg/host_on_off_processes/CMakeLists.txt index 166f781ebe..91946d3671 100644 --- a/teshsuite/msg/host_on_off_processes/CMakeLists.txt +++ b/teshsuite/msg/host_on_off_processes/CMakeLists.txt @@ -1,6 +1,4 @@ -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - -add_executable(host_on_off_processes host_on_off_processes.c) +add_executable (host_on_off_processes host_on_off_processes.c) target_link_libraries(host_on_off_processes simgrid) set(tesh_files diff --git a/teshsuite/msg/pid/CMakeLists.txt b/teshsuite/msg/pid/CMakeLists.txt index c8c0e901a0..988789a58f 100644 --- a/teshsuite/msg/pid/CMakeLists.txt +++ b/teshsuite/msg/pid/CMakeLists.txt @@ -1,13 +1,5 @@ -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - -add_executable(pid pid.c) - -### Add definitions for compile -if(NOT WIN32) - target_link_libraries(pid simgrid m pthread) -else() - target_link_libraries(pid simgrid) -endif() +add_executable (pid pid.c) +target_link_libraries(pid simgrid) set(tesh_files ${tesh_files} diff --git a/teshsuite/msg/process/CMakeLists.txt b/teshsuite/msg/process/CMakeLists.txt index 685c635462..903406549e 100644 --- a/teshsuite/msg/process/CMakeLists.txt +++ b/teshsuite/msg/process/CMakeLists.txt @@ -1,6 +1,4 @@ -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - -add_executable(process process.c) +add_executable (process process.c) target_link_libraries(process simgrid) set(tesh_files diff --git a/teshsuite/msg/process_join/CMakeLists.txt b/teshsuite/msg/process_join/CMakeLists.txt index 883aa86b6c..adb7caccaf 100644 --- a/teshsuite/msg/process_join/CMakeLists.txt +++ b/teshsuite/msg/process_join/CMakeLists.txt @@ -1,6 +1,4 @@ -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - -add_executable(process_join ${CMAKE_HOME_DIRECTORY}/teshsuite/msg/process_join/process_join.c) +add_executable (process_join process_join.c) target_link_libraries(process_join simgrid) set(tesh_files diff --git a/teshsuite/msg/storage/CMakeLists.txt b/teshsuite/msg/storage/CMakeLists.txt index be971dfdec..68bc0d895c 100644 --- a/teshsuite/msg/storage/CMakeLists.txt +++ b/teshsuite/msg/storage/CMakeLists.txt @@ -1,16 +1,7 @@ -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - -add_executable(storage_basic storage_basic.c) -add_executable(concurrent_rw concurrent_rw.c) - -### Add definitions for compile -if(NOT WIN32) - target_link_libraries(storage_basic simgrid m pthread ) - target_link_libraries(concurrent_rw simgrid m pthread ) -else() - target_link_libraries(storage_basic simgrid) - target_link_libraries(concurrent_rw simgrid) -endif() +add_executable (storage_basic storage_basic.c) +target_link_libraries(storage_basic simgrid) +add_executable (concurrent_rw concurrent_rw.c) +target_link_libraries(concurrent_rw simgrid) set(tesh_files ${tesh_files} diff --git a/teshsuite/msg/task_destroy_cancel/CMakeLists.txt b/teshsuite/msg/task_destroy_cancel/CMakeLists.txt index 716f4be67f..bfcd350dcb 100644 --- a/teshsuite/msg/task_destroy_cancel/CMakeLists.txt +++ b/teshsuite/msg/task_destroy_cancel/CMakeLists.txt @@ -1,6 +1,4 @@ -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - -add_executable(task_destroy_cancel task_destroy_cancel.c) +add_executable (task_destroy_cancel task_destroy_cancel.c) target_link_libraries(task_destroy_cancel simgrid) set(tesh_files diff --git a/teshsuite/msg/trace/CMakeLists.txt b/teshsuite/msg/trace/CMakeLists.txt index e7663b66ea..f7c52b26ed 100644 --- a/teshsuite/msg/trace/CMakeLists.txt +++ b/teshsuite/msg/trace/CMakeLists.txt @@ -1,6 +1,4 @@ -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - -add_executable(test_trace_integration test_trace_integration.c) +add_executable (test_trace_integration test_trace_integration.c) target_link_libraries(test_trace_integration simgrid) set(tesh_files diff --git a/teshsuite/simdag/availability/CMakeLists.txt b/teshsuite/simdag/availability/CMakeLists.txt index 05cdb9cf2f..798d88a191 100644 --- a/teshsuite/simdag/availability/CMakeLists.txt +++ b/teshsuite/simdag/availability/CMakeLists.txt @@ -1,6 +1,4 @@ -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - -add_executable(availability_test availability_test.c) +add_executable (availability_test availability_test.c) target_link_libraries(availability_test simgrid) set(tesh_files diff --git a/teshsuite/simdag/basic/CMakeLists.txt b/teshsuite/simdag/basic/CMakeLists.txt index 69af506766..2fd0417269 100644 --- a/teshsuite/simdag/basic/CMakeLists.txt +++ b/teshsuite/simdag/basic/CMakeLists.txt @@ -1,19 +1,16 @@ -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - -add_executable(basic0 basic0.c) -add_executable(basic1 basic1.c) -add_executable(basic2 basic2.c) -add_executable(basic3 basic3.c) -add_executable(basic4 basic4.c) -add_executable(basic5 basic5.c) -add_executable(basic6 basic6.c) - +add_executable (basic0 basic0.c) target_link_libraries(basic0 simgrid) +add_executable (basic1 basic1.c) target_link_libraries(basic1 simgrid) +add_executable (basic2 basic2.c) target_link_libraries(basic2 simgrid) +add_executable (basic3 basic3.c) target_link_libraries(basic3 simgrid) +add_executable (basic4 basic4.c) target_link_libraries(basic4 simgrid) +add_executable (basic5 basic5.c) target_link_libraries(basic5 simgrid) +add_executable (basic6 basic6.c) target_link_libraries(basic6 simgrid) set(tesh_files diff --git a/teshsuite/simdag/incomplete/CMakeLists.txt b/teshsuite/simdag/incomplete/CMakeLists.txt index d62eb992d6..c742098b58 100644 --- a/teshsuite/simdag/incomplete/CMakeLists.txt +++ b/teshsuite/simdag/incomplete/CMakeLists.txt @@ -1,6 +1,4 @@ -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - -add_executable(incomplete incomplete.c) +add_executable (incomplete incomplete.c) target_link_libraries(incomplete simgrid) set(tesh_files diff --git a/teshsuite/simdag/network/mxn/CMakeLists.txt b/teshsuite/simdag/network/mxn/CMakeLists.txt index 7c60a4bde3..2d536b6c59 100644 --- a/teshsuite/simdag/network/mxn/CMakeLists.txt +++ b/teshsuite/simdag/network/mxn/CMakeLists.txt @@ -1,11 +1,9 @@ -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) -add_executable(test_intra_scatter test_intra_scatter.c) -target_link_libraries(test_intra_all2all simgrid) +add_executable (test_intra_all2all test_intra_all2all.c) +target_link_libraries(test_intra_all2all simgrid) +add_executable (test_intra_independent_comm test_intra_independent_comm.c) target_link_libraries(test_intra_independent_comm simgrid) -target_link_libraries(test_intra_scatter simgrid) +add_executable (test_intra_scatter test_intra_scatter.c) +target_link_libraries(test_intra_scatter simgrid) set(tesh_files ${tesh_files} diff --git a/teshsuite/simdag/network/p2p/CMakeLists.txt b/teshsuite/simdag/network/p2p/CMakeLists.txt index 5f68137487..931f2e0582 100644 --- a/teshsuite/simdag/network/p2p/CMakeLists.txt +++ b/teshsuite/simdag/network/p2p/CMakeLists.txt @@ -1,12 +1,10 @@ -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - -add_executable(test_latency1 test_latency1.c) -add_executable(test_latency2 test_latency2.c) -add_executable(test_latency3 test_latency3.c) -add_executable(test_latency_bound test_latency_bound.c) -target_link_libraries(test_latency1 simgrid) -target_link_libraries(test_latency2 simgrid) -target_link_libraries(test_latency3 simgrid) +add_executable (test_latency1 test_latency1.c) +target_link_libraries(test_latency1 simgrid) +add_executable (test_latency2 test_latency2.c) +target_link_libraries(test_latency2 simgrid) +add_executable (test_latency3 test_latency3.c) +target_link_libraries(test_latency3 simgrid) +add_executable (test_latency_bound test_latency_bound.c) target_link_libraries(test_latency_bound simgrid) set(tesh_files diff --git a/teshsuite/simdag/partask/CMakeLists.txt b/teshsuite/simdag/partask/CMakeLists.txt index 176ea1e249..bf3a960e26 100644 --- a/teshsuite/simdag/partask/CMakeLists.txt +++ b/teshsuite/simdag/partask/CMakeLists.txt @@ -1,8 +1,6 @@ -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) +add_executable (test_comp_only_seq test_comp_only_seq.c) target_link_libraries(test_comp_only_seq simgrid) +add_executable (test_comp_only_par test_comp_only_par.c) target_link_libraries(test_comp_only_par simgrid) set(tesh_files diff --git a/teshsuite/simdag/platforms/CMakeLists.txt b/teshsuite/simdag/platforms/CMakeLists.txt index 89f52e4f20..e4ccbac816 100644 --- a/teshsuite/simdag/platforms/CMakeLists.txt +++ b/teshsuite/simdag/platforms/CMakeLists.txt @@ -1,21 +1,15 @@ -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.cpp) -add_executable(flatifier flatifier.cpp) -add_executable(basic_link_test basic_link_test.c) -target_link_libraries(basic_parsing_test simgrid) -target_link_libraries(is_router_test simgrid) -target_link_libraries(flatifier simgrid) -target_link_libraries(basic_link_test simgrid) - -### Add definitions for compile -if(NOT WIN32) - add_executable(evaluate_parse_time Evaluate_parse_time.c) - add_executable(evaluate_get_route_time Evaluate_get_route_time.c) - target_link_libraries(evaluate_get_route_time simgrid m) - target_link_libraries(evaluate_parse_time simgrid m) -endif() +add_executable (basic_parsing_test basic_parsing_test.c) +target_link_libraries(basic_parsing_test simgrid) +add_executable (is_router_test is_router_test.cpp) +target_link_libraries(is_router_test simgrid) +add_executable (flatifier flatifier.cpp) +target_link_libraries(flatifier simgrid) +add_executable (basic_link_test basic_link_test.c) +target_link_libraries(basic_link_test simgrid) +add_executable (evaluate_parse_time Evaluate_parse_time.c) +target_link_libraries(evaluate_parse_time simgrid) +add_executable (evaluate_get_route_time Evaluate_get_route_time.c) +target_link_libraries(evaluate_get_route_time simgrid) set(tesh_files ${tesh_files} diff --git a/teshsuite/simix/check_defaults/CMakeLists.txt b/teshsuite/simix/check_defaults/CMakeLists.txt index 4fcacc6007..956573cbaa 100644 --- a/teshsuite/simix/check_defaults/CMakeLists.txt +++ b/teshsuite/simix/check_defaults/CMakeLists.txt @@ -1,6 +1,4 @@ -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - -add_executable(check_defaults check_defaults.c) +add_executable (check_defaults check_defaults.c) target_link_libraries(check_defaults simgrid) set(tesh_files diff --git a/teshsuite/simix/stack_overflow/CMakeLists.txt b/teshsuite/simix/stack_overflow/CMakeLists.txt index ed9b2cc7f1..4547f05687 100644 --- a/teshsuite/simix/stack_overflow/CMakeLists.txt +++ b/teshsuite/simix/stack_overflow/CMakeLists.txt @@ -1,6 +1,4 @@ -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - -add_executable(stack_overflow stack_overflow.c) +add_executable (stack_overflow stack_overflow.c) target_link_libraries(stack_overflow simgrid) set(tesh_files diff --git a/teshsuite/smpi/CMakeLists.txt b/teshsuite/smpi/CMakeLists.txt index 0f9d37fcc5..00b7004ac6 100644 --- a/teshsuite/smpi/CMakeLists.txt +++ b/teshsuite/smpi/CMakeLists.txt @@ -4,7 +4,6 @@ if(enable_smpi) else() set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") endif() - set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") endif() set(bin_files diff --git a/teshsuite/smpi/allgather/CMakeLists.txt b/teshsuite/smpi/allgather/CMakeLists.txt index 461a767508..115a5216f6 100644 --- a/teshsuite/smpi/allgather/CMakeLists.txt +++ b/teshsuite/smpi/allgather/CMakeLists.txt @@ -4,11 +4,9 @@ if(enable_smpi) else() set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") endif() - - set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") - add_executable(allgather_coll allgather_coll.c) + + add_executable (allgather_coll allgather_coll.c) target_link_libraries(allgather_coll simgrid) endif() diff --git a/teshsuite/smpi/allgatherv/CMakeLists.txt b/teshsuite/smpi/allgatherv/CMakeLists.txt index 357400d11f..e5f1e63cf1 100644 --- a/teshsuite/smpi/allgatherv/CMakeLists.txt +++ b/teshsuite/smpi/allgatherv/CMakeLists.txt @@ -4,11 +4,9 @@ if(enable_smpi) else() set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") endif() - - set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") - add_executable(allgatherv_coll allgatherv_coll.c) + + add_executable (allgatherv_coll allgatherv_coll.c) target_link_libraries(allgatherv_coll simgrid) endif() diff --git a/teshsuite/smpi/allreduce/CMakeLists.txt b/teshsuite/smpi/allreduce/CMakeLists.txt index da60278113..3db2745b71 100644 --- a/teshsuite/smpi/allreduce/CMakeLists.txt +++ b/teshsuite/smpi/allreduce/CMakeLists.txt @@ -4,13 +4,11 @@ if(enable_smpi) else() set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") endif() - - set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") - add_executable(allreduce allreduce.c) - add_executable(allreduce_coll allreduce_coll.c) - target_link_libraries(allreduce simgrid) + + add_executable (allreduce allreduce.c) + target_link_libraries(allreduce simgrid) + add_executable (allreduce_coll allreduce_coll.c) target_link_libraries(allreduce_coll simgrid) endif() diff --git a/teshsuite/smpi/alltoall/CMakeLists.txt b/teshsuite/smpi/alltoall/CMakeLists.txt index e4d3721f5a..be01542e47 100644 --- a/teshsuite/smpi/alltoall/CMakeLists.txt +++ b/teshsuite/smpi/alltoall/CMakeLists.txt @@ -4,16 +4,14 @@ if(enable_smpi) else() set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") endif() - - set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") - add_executable(alltoall2 alltoall2.c) - add_executable(alltoall_basic alltoall_basic.c) - add_executable(alltoall_coll alltoall_coll.c) - target_link_libraries(alltoall2 simgrid) + + add_executable (alltoall2 alltoall2.c) + target_link_libraries(alltoall2 simgrid) + add_executable (alltoall_basic alltoall_basic.c) target_link_libraries(alltoall_basic simgrid) - target_link_libraries(alltoall_coll simgrid) + add_executable (alltoall_coll alltoall_coll.c) + target_link_libraries(alltoall_coll simgrid) endif() diff --git a/teshsuite/smpi/alltoallv/CMakeLists.txt b/teshsuite/smpi/alltoallv/CMakeLists.txt index b4b1f7573f..513de644a4 100644 --- a/teshsuite/smpi/alltoallv/CMakeLists.txt +++ b/teshsuite/smpi/alltoallv/CMakeLists.txt @@ -4,11 +4,9 @@ if(enable_smpi) else() set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") endif() - - set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") - add_executable(alltoallv_coll alltoallv_coll.c) + + add_executable (alltoallv_coll alltoallv_coll.c) target_link_libraries(alltoallv_coll simgrid) endif() diff --git a/teshsuite/smpi/barrier/CMakeLists.txt b/teshsuite/smpi/barrier/CMakeLists.txt index 6bef622409..fffb3adb83 100644 --- a/teshsuite/smpi/barrier/CMakeLists.txt +++ b/teshsuite/smpi/barrier/CMakeLists.txt @@ -4,11 +4,9 @@ if(enable_smpi) else() set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") endif() - - set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") - add_executable(barrier_coll barrier.c ) + + add_executable (barrier_coll barrier.c) target_link_libraries(barrier_coll simgrid) endif() diff --git a/teshsuite/smpi/bcast/CMakeLists.txt b/teshsuite/smpi/bcast/CMakeLists.txt index 8082f5b9f4..9789588162 100644 --- a/teshsuite/smpi/bcast/CMakeLists.txt +++ b/teshsuite/smpi/bcast/CMakeLists.txt @@ -4,13 +4,11 @@ if(enable_smpi) else() set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") endif() - - set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") - add_executable(bcast bcast.c) - add_executable(bcast_coll bcast_coll.c) + + add_executable (bcast bcast.c) target_link_libraries(bcast simgrid) + add_executable (bcast_coll bcast_coll.c) target_link_libraries(bcast_coll simgrid) endif() diff --git a/teshsuite/smpi/compute/CMakeLists.txt b/teshsuite/smpi/compute/CMakeLists.txt index d3d1510acf..51849dff69 100644 --- a/teshsuite/smpi/compute/CMakeLists.txt +++ b/teshsuite/smpi/compute/CMakeLists.txt @@ -4,15 +4,13 @@ if(enable_smpi) else() set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") endif() - - set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") - add_executable(compute compute.c) - add_executable(compute2 compute2.c) - add_executable(compute3 compute3.c) - target_link_libraries(compute simgrid) + + add_executable (compute compute.c) + target_link_libraries(compute simgrid) + add_executable (compute2 compute2.c) target_link_libraries(compute2 simgrid) + add_executable (compute3 compute3.c) target_link_libraries(compute3 simgrid) endif() diff --git a/teshsuite/smpi/gather/CMakeLists.txt b/teshsuite/smpi/gather/CMakeLists.txt index 24e2bfa632..4918607726 100644 --- a/teshsuite/smpi/gather/CMakeLists.txt +++ b/teshsuite/smpi/gather/CMakeLists.txt @@ -4,11 +4,9 @@ if(enable_smpi) else() set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") endif() - - set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") - add_executable(gather_coll gather_coll.c) + + add_executable (gather_coll gather_coll.c) target_link_libraries(gather_coll simgrid) endif() diff --git a/teshsuite/smpi/hvector/CMakeLists.txt b/teshsuite/smpi/hvector/CMakeLists.txt index 30f167a1f0..5bea7ba16e 100644 --- a/teshsuite/smpi/hvector/CMakeLists.txt +++ b/teshsuite/smpi/hvector/CMakeLists.txt @@ -4,11 +4,9 @@ if(enable_smpi) else() set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") endif() - - set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") - add_executable(hvector_test hvector_test.c) + + add_executable (hvector_test hvector_test.c) target_link_libraries(hvector_test simgrid) endif() diff --git a/teshsuite/smpi/indexed/CMakeLists.txt b/teshsuite/smpi/indexed/CMakeLists.txt index 116a9dec78..c0b9b2e545 100644 --- a/teshsuite/smpi/indexed/CMakeLists.txt +++ b/teshsuite/smpi/indexed/CMakeLists.txt @@ -4,11 +4,9 @@ if(enable_smpi) else() set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") endif() - - set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") - add_executable(indexed_test indexed_test.c) + + add_executable (indexed_test indexed_test.c) target_link_libraries(indexed_test simgrid) endif() diff --git a/teshsuite/smpi/isp/umpire/CMakeLists.txt b/teshsuite/smpi/isp/umpire/CMakeLists.txt index 1200f99eef..5402549e0e 100644 --- a/teshsuite/smpi/isp/umpire/CMakeLists.txt +++ b/teshsuite/smpi/isp/umpire/CMakeLists.txt @@ -193,8 +193,6 @@ if(enable_smpi AND enable_model-checking AND enable_smpi_ISP_testsuite) set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpiff") - set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") foreach (test ${umpire_tests_passing} ${umpire_tests_deadlock} ${umpire_tests_problematic} ) diff --git a/teshsuite/smpi/mpich3-test/CMakeLists.txt b/teshsuite/smpi/mpich3-test/CMakeLists.txt index af1878e023..4e912b95a4 100644 --- a/teshsuite/smpi/mpich3-test/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/CMakeLists.txt @@ -3,12 +3,6 @@ set(bin_files ${CMAKE_CURRENT_SOURCE_DIR}/generate_report PARENT_SCOPE) -#set(stdo_std_smpi -# ${CMAKE_CURRENT_SOURCE_DIR}/topol/cartmap.std -# ${CMAKE_CURRENT_SOURCE_DIR}/topol/graphtest.std -# ${CMAKE_CURRENT_SOURCE_DIR}/topol/cartf.std -#) - if("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_HOME_DIRECTORY}") else() foreach(srcfile ${stdo_std_smpi}) @@ -46,7 +40,6 @@ else() set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") endif() -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include/") diff --git a/teshsuite/smpi/mpich3-test/attr/CMakeLists.txt b/teshsuite/smpi/mpich3-test/attr/CMakeLists.txt index 6b0070d9c1..90eba93fde 100644 --- a/teshsuite/smpi/mpich3-test/attr/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/attr/CMakeLists.txt @@ -6,8 +6,6 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite) set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpiff") endif() - set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/") diff --git a/teshsuite/smpi/mpich3-test/coll/CMakeLists.txt b/teshsuite/smpi/mpich3-test/coll/CMakeLists.txt index 50c3974ba2..535763942f 100644 --- a/teshsuite/smpi/mpich3-test/coll/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/coll/CMakeLists.txt @@ -6,7 +6,6 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite) set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpiff") endif() - set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/") diff --git a/teshsuite/smpi/mpich3-test/comm/CMakeLists.txt b/teshsuite/smpi/mpich3-test/comm/CMakeLists.txt index 0621e163cf..07b39360ad 100644 --- a/teshsuite/smpi/mpich3-test/comm/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/comm/CMakeLists.txt @@ -6,7 +6,6 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite) set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpiff") endif() - set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/") diff --git a/teshsuite/smpi/mpich3-test/datatype/CMakeLists.txt b/teshsuite/smpi/mpich3-test/datatype/CMakeLists.txt index 7c92987eb7..f5229fc050 100644 --- a/teshsuite/smpi/mpich3-test/datatype/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/datatype/CMakeLists.txt @@ -6,7 +6,6 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite) set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpiff") endif() - set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/") diff --git a/teshsuite/smpi/mpich3-test/f77/attr/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/attr/CMakeLists.txt index f15b0cd391..013b1c2925 100644 --- a/teshsuite/smpi/mpich3-test/f77/attr/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f77/attr/CMakeLists.txt @@ -6,7 +6,6 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN) set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpiff") endif() - set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../../include/") diff --git a/teshsuite/smpi/mpich3-test/f77/coll/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/coll/CMakeLists.txt index 74459dc384..d8e0cd7c1a 100644 --- a/teshsuite/smpi/mpich3-test/f77/coll/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f77/coll/CMakeLists.txt @@ -6,7 +6,6 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN) set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpiff") endif() - set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/") diff --git a/teshsuite/smpi/mpich3-test/f77/comm/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/comm/CMakeLists.txt index 9882a1772f..7ec483b02b 100644 --- a/teshsuite/smpi/mpich3-test/f77/comm/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f77/comm/CMakeLists.txt @@ -6,7 +6,6 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN) set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpiff") endif() - set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/") diff --git a/teshsuite/smpi/mpich3-test/f77/datatype/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/datatype/CMakeLists.txt index fc2942a66e..26b871a879 100644 --- a/teshsuite/smpi/mpich3-test/f77/datatype/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f77/datatype/CMakeLists.txt @@ -6,7 +6,6 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN) set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpiff") endif() - set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/") diff --git a/teshsuite/smpi/mpich3-test/f77/ext/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/ext/CMakeLists.txt index 6de863cc9d..858c661a99 100644 --- a/teshsuite/smpi/mpich3-test/f77/ext/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f77/ext/CMakeLists.txt @@ -6,7 +6,6 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN) set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpiff") endif() - set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/") diff --git a/teshsuite/smpi/mpich3-test/f77/info/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/info/CMakeLists.txt index d47edb7177..312c94544b 100644 --- a/teshsuite/smpi/mpich3-test/f77/info/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f77/info/CMakeLists.txt @@ -7,7 +7,6 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN) endif() set(CMAKE_INCLUDE_CURRENT_DIR ON) - set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/") diff --git a/teshsuite/smpi/mpich3-test/f77/init/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/init/CMakeLists.txt index 6d7fda3282..d96353a488 100644 --- a/teshsuite/smpi/mpich3-test/f77/init/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f77/init/CMakeLists.txt @@ -6,7 +6,6 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN) set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpiff") endif() - set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/") diff --git a/teshsuite/smpi/mpich3-test/f77/pt2pt/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/pt2pt/CMakeLists.txt index 3dfc6c4e7d..db09537e41 100644 --- a/teshsuite/smpi/mpich3-test/f77/pt2pt/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f77/pt2pt/CMakeLists.txt @@ -7,7 +7,6 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN) endif() set(CMAKE_INCLUDE_CURRENT_DIR ON) - set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/") diff --git a/teshsuite/smpi/mpich3-test/f77/rma/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/rma/CMakeLists.txt index d5b57fd1bb..5231aa57a9 100644 --- a/teshsuite/smpi/mpich3-test/f77/rma/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f77/rma/CMakeLists.txt @@ -6,7 +6,6 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN) set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpiff") endif() - set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/") diff --git a/teshsuite/smpi/mpich3-test/f77/topo/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/topo/CMakeLists.txt index 1258e4ac46..8ec623ef37 100644 --- a/teshsuite/smpi/mpich3-test/f77/topo/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f77/topo/CMakeLists.txt @@ -6,7 +6,6 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN) set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpiff") endif() - set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/") diff --git a/teshsuite/smpi/mpich3-test/f77/util/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/util/CMakeLists.txt index e8535984cb..15a52a780a 100644 --- a/teshsuite/smpi/mpich3-test/f77/util/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f77/util/CMakeLists.txt @@ -6,7 +6,6 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN) set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpiff") endif() - set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/") diff --git a/teshsuite/smpi/mpich3-test/f90/coll/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f90/coll/CMakeLists.txt index 7d298370f8..247b492880 100644 --- a/teshsuite/smpi/mpich3-test/f90/coll/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f90/coll/CMakeLists.txt @@ -6,7 +6,6 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN) set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpif90") endif() - set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") # add_executable(allredint8f90 allredint8f90.f90) diff --git a/teshsuite/smpi/mpich3-test/f90/datatype/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f90/datatype/CMakeLists.txt index cdedaad2fa..e7f7e95a21 100644 --- a/teshsuite/smpi/mpich3-test/f90/datatype/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f90/datatype/CMakeLists.txt @@ -6,7 +6,6 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN) set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpif90") endif() - set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") # add_executable(allctypesf90 allctypesf90.f90) diff --git a/teshsuite/smpi/mpich3-test/f90/info/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f90/info/CMakeLists.txt index b7821977fd..e70c7a0e02 100644 --- a/teshsuite/smpi/mpich3-test/f90/info/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f90/info/CMakeLists.txt @@ -6,7 +6,6 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN) set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpif90") endif() - set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") add_executable(infotest2f90 infotest2f90.f90 ../util/mtestf90.f90) diff --git a/teshsuite/smpi/mpich3-test/f90/init/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f90/init/CMakeLists.txt index de127c5a47..1cb8e906af 100644 --- a/teshsuite/smpi/mpich3-test/f90/init/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f90/init/CMakeLists.txt @@ -6,7 +6,6 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN) set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpif90") endif() - set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") add_executable(baseenvf90 baseenvf90.f90) diff --git a/teshsuite/smpi/mpich3-test/f90/pt2pt/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f90/pt2pt/CMakeLists.txt index d2932074f0..5045e564fd 100644 --- a/teshsuite/smpi/mpich3-test/f90/pt2pt/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f90/pt2pt/CMakeLists.txt @@ -6,7 +6,6 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN) set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpif90") endif() - set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") add_executable(allpairf90 allpairf90.f90) diff --git a/teshsuite/smpi/mpich3-test/f90/rma/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f90/rma/CMakeLists.txt index 720c4735fc..2572c4bb42 100644 --- a/teshsuite/smpi/mpich3-test/f90/rma/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f90/rma/CMakeLists.txt @@ -6,7 +6,6 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN) set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpif90") endif() - set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/") diff --git a/teshsuite/smpi/mpich3-test/f90/util/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f90/util/CMakeLists.txt index 9abba67c17..a488dabd7e 100644 --- a/teshsuite/smpi/mpich3-test/f90/util/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f90/util/CMakeLists.txt @@ -6,7 +6,6 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN) set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpif90") endif() - set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") #F90 version of the mtest library diff --git a/teshsuite/smpi/mpich3-test/group/CMakeLists.txt b/teshsuite/smpi/mpich3-test/group/CMakeLists.txt index 4752ea19a6..0f890fe4d7 100644 --- a/teshsuite/smpi/mpich3-test/group/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/group/CMakeLists.txt @@ -6,7 +6,6 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite) set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpiff") endif() - set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/") diff --git a/teshsuite/smpi/mpich3-test/info/CMakeLists.txt b/teshsuite/smpi/mpich3-test/info/CMakeLists.txt index 259cdd913e..e2528f5c8b 100644 --- a/teshsuite/smpi/mpich3-test/info/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/info/CMakeLists.txt @@ -6,8 +6,6 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite) set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpiff") endif() - set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/") diff --git a/teshsuite/smpi/mpich3-test/init/CMakeLists.txt b/teshsuite/smpi/mpich3-test/init/CMakeLists.txt index 9066dc2b40..8a0e2d3cd0 100644 --- a/teshsuite/smpi/mpich3-test/init/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/init/CMakeLists.txt @@ -6,7 +6,6 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite) set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpiff") endif() - set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/") diff --git a/teshsuite/smpi/mpich3-test/perf/CMakeLists.txt b/teshsuite/smpi/mpich3-test/perf/CMakeLists.txt index 686fe1bad9..60ab82a7aa 100644 --- a/teshsuite/smpi/mpich3-test/perf/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/perf/CMakeLists.txt @@ -6,8 +6,6 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite) set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpiff") endif() - set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/") diff --git a/teshsuite/smpi/mpich3-test/pt2pt/CMakeLists.txt b/teshsuite/smpi/mpich3-test/pt2pt/CMakeLists.txt index 4ca54a0c36..3fe7256b41 100644 --- a/teshsuite/smpi/mpich3-test/pt2pt/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/pt2pt/CMakeLists.txt @@ -6,7 +6,6 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite) set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpiff") endif() - set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/") diff --git a/teshsuite/smpi/mpich3-test/rma/CMakeLists.txt b/teshsuite/smpi/mpich3-test/rma/CMakeLists.txt index ec4fdaa977..ae1f882a93 100644 --- a/teshsuite/smpi/mpich3-test/rma/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/rma/CMakeLists.txt @@ -6,7 +6,6 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite) set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpiff") endif() - set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") set(MPICH_FLAGS "-DHAVE_STDLIB_H=1 -DHAVE_UNISTD_H=1 -DHAVE_STRING_H=1 -DUSE_STDARG=1 -DHAVE_LONG_DOUBLE=1 -DHAVE_PROTOTYPES=1 -DHAVE_SIGNAL_H=1 -DHAVE_SIGACTION=1 -DHAVE_SLEEP=1 -DHAVE_SYSCONF=1 -Wno-error=unused-variable") include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/") diff --git a/teshsuite/smpi/mpich3-test/topo/CMakeLists.txt b/teshsuite/smpi/mpich3-test/topo/CMakeLists.txt index 3a9fd06ac1..3677016daa 100644 --- a/teshsuite/smpi/mpich3-test/topo/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/topo/CMakeLists.txt @@ -6,7 +6,6 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite) set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpiff") endif() - set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/") diff --git a/teshsuite/smpi/pingpong/CMakeLists.txt b/teshsuite/smpi/pingpong/CMakeLists.txt index dc15032f90..f4d90cb332 100644 --- a/teshsuite/smpi/pingpong/CMakeLists.txt +++ b/teshsuite/smpi/pingpong/CMakeLists.txt @@ -4,14 +4,12 @@ if(enable_smpi) else() set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") endif() - - set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") - add_executable(pingpong pingpong.c) - add_executable(dsend dsend.c) + + add_executable (pingpong pingpong.c) target_link_libraries(pingpong simgrid) - target_link_libraries(dsend simgrid) + add_executable (dsend dsend.c) + target_link_libraries(dsend simgrid) endif() set(tesh_files diff --git a/teshsuite/smpi/reduce/CMakeLists.txt b/teshsuite/smpi/reduce/CMakeLists.txt index 651fa421e6..af3df4d5e7 100644 --- a/teshsuite/smpi/reduce/CMakeLists.txt +++ b/teshsuite/smpi/reduce/CMakeLists.txt @@ -4,15 +4,13 @@ if(enable_smpi) else() set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") endif() - - set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") - add_executable(reduce reduce.c) - add_executable(reduce_coll reduce_coll.c) - add_executable(reduce_scatter_coll reduce_scatter_coll.c) - target_link_libraries(reduce simgrid) - target_link_libraries(reduce_coll simgrid) + + add_executable (reduce reduce.c) + target_link_libraries(reduce simgrid) + add_executable (reduce_coll reduce_coll.c) + target_link_libraries(reduce_coll simgrid) + add_executable (reduce_scatter_coll reduce_scatter_coll.c) target_link_libraries(reduce_scatter_coll simgrid) endif() diff --git a/teshsuite/smpi/scatter/CMakeLists.txt b/teshsuite/smpi/scatter/CMakeLists.txt index 73880273fd..001cd6245c 100644 --- a/teshsuite/smpi/scatter/CMakeLists.txt +++ b/teshsuite/smpi/scatter/CMakeLists.txt @@ -4,11 +4,9 @@ if(enable_smpi) else() set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") endif() - - set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") - add_executable(scatter scatter.c) + + add_executable (scatter scatter.c) target_link_libraries(scatter simgrid) endif() diff --git a/teshsuite/smpi/shared/CMakeLists.txt b/teshsuite/smpi/shared/CMakeLists.txt index 517ce09d43..2c9be7d296 100644 --- a/teshsuite/smpi/shared/CMakeLists.txt +++ b/teshsuite/smpi/shared/CMakeLists.txt @@ -4,12 +4,10 @@ if(enable_smpi) else() set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") endif() - - set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") + if(NOT WIN32) - add_executable(shared shared.c) + add_executable (shared shared.c) target_link_libraries(shared simgrid) endif() endif() diff --git a/teshsuite/smpi/struct/CMakeLists.txt b/teshsuite/smpi/struct/CMakeLists.txt index a410060b83..3f0cb7e900 100644 --- a/teshsuite/smpi/struct/CMakeLists.txt +++ b/teshsuite/smpi/struct/CMakeLists.txt @@ -4,11 +4,9 @@ if(enable_smpi) else() set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") endif() - - set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") - add_executable(struct_test struct_test.c) + + add_executable (struct_test struct_test.c) target_link_libraries(struct_test simgrid) endif() diff --git a/teshsuite/smpi/vector/CMakeLists.txt b/teshsuite/smpi/vector/CMakeLists.txt index b356e78437..9d8960cbf9 100644 --- a/teshsuite/smpi/vector/CMakeLists.txt +++ b/teshsuite/smpi/vector/CMakeLists.txt @@ -4,11 +4,9 @@ if(enable_smpi) else() set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") endif() - - set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") - add_executable(vector_test vector_test.c) + + add_executable (vector_test vector_test.c) target_link_libraries(vector_test simgrid) endif() diff --git a/teshsuite/surf/lmm_usage/CMakeLists.txt b/teshsuite/surf/lmm_usage/CMakeLists.txt index 0f1b817c8a..78d0d1690a 100644 --- a/teshsuite/surf/lmm_usage/CMakeLists.txt +++ b/teshsuite/surf/lmm_usage/CMakeLists.txt @@ -1,13 +1,5 @@ -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - -add_executable(lmm_usage ${CMAKE_HOME_DIRECTORY}/teshsuite/surf/lmm_usage/lmm_usage.c) - -### Add definitions for compile -if(NOT WIN32) - target_link_libraries(lmm_usage simgrid m ) -else() - target_link_libraries(lmm_usage simgrid ) -endif() +add_executable (lmm_usage lmm_usage.c) +target_link_libraries(lmm_usage simgrid) set(tesh_files ${tesh_files} diff --git a/teshsuite/surf/maxmin_bench/CMakeLists.txt b/teshsuite/surf/maxmin_bench/CMakeLists.txt index 429e117bbe..17752d71c8 100644 --- a/teshsuite/surf/maxmin_bench/CMakeLists.txt +++ b/teshsuite/surf/maxmin_bench/CMakeLists.txt @@ -1,14 +1,5 @@ -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - -add_executable(maxmin_bench ${CMAKE_HOME_DIRECTORY}/teshsuite/surf/maxmin_bench/maxmin_bench.c) - -### Add definitions for compile -if(NOT WIN32) - target_link_libraries(maxmin_bench simgrid m ) -else() - target_link_libraries(maxmin_bench simgrid ) - set_target_properties(maxmin_bench PROPERTIES COMPILE_FLAGS "-DDLL_STATIC") -endif() +add_executable (maxmin_bench maxmin_bench.c) +target_link_libraries(maxmin_bench simgrid) set(tesh_files ${tesh_files} diff --git a/teshsuite/surf/surf_usage/CMakeLists.txt b/teshsuite/surf/surf_usage/CMakeLists.txt index 1ac7848dd7..76f38b44d7 100644 --- a/teshsuite/surf/surf_usage/CMakeLists.txt +++ b/teshsuite/surf/surf_usage/CMakeLists.txt @@ -1,16 +1,7 @@ -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - -add_executable(surf_usage ${CMAKE_HOME_DIRECTORY}/teshsuite/surf/surf_usage/surf_usage.cpp) -add_executable(surf_usage2 ${CMAKE_HOME_DIRECTORY}/teshsuite/surf/surf_usage/surf_usage2.cpp) - -### Add definitions for compile -if(NOT WIN32) - target_link_libraries(surf_usage simgrid m ) - target_link_libraries(surf_usage2 simgrid m ) -else() - target_link_libraries(surf_usage simgrid ) - target_link_libraries(surf_usage2 simgrid ) -endif() +add_executable (surf_usage surf_usage.cpp) +target_link_libraries(surf_usage simgrid) +add_executable (surf_usage2 surf_usage2.cpp) +target_link_libraries(surf_usage2 simgrid ) set(tesh_files ${tesh_files} diff --git a/teshsuite/surf/trace_usage/CMakeLists.txt b/teshsuite/surf/trace_usage/CMakeLists.txt index 09c918a509..1bf1224dbb 100644 --- a/teshsuite/surf/trace_usage/CMakeLists.txt +++ b/teshsuite/surf/trace_usage/CMakeLists.txt @@ -1,13 +1,5 @@ -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - -add_executable(trace_usage ${CMAKE_HOME_DIRECTORY}/teshsuite/surf/trace_usage/trace_usage.cpp) - -### Add definitions for compile -if(NOT WIN32) - target_link_libraries(trace_usage simgrid m) -else() - target_link_libraries(trace_usage simgrid ) -endif() +add_executable(trace_usage trace_usage.cpp) +target_link_libraries(trace_usage simgrid) set(tesh_files ${tesh_files} diff --git a/teshsuite/xbt/graphxml_usage/CMakeLists.txt b/teshsuite/xbt/graphxml_usage/CMakeLists.txt index 1d6f8b337a..46a11ec666 100644 --- a/teshsuite/xbt/graphxml_usage/CMakeLists.txt +++ b/teshsuite/xbt/graphxml_usage/CMakeLists.txt @@ -1,13 +1,5 @@ -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - -add_executable(graphxml_usage ${CMAKE_HOME_DIRECTORY}/teshsuite/xbt/graphxml_usage/graphxml_usage.c) - -### Add definitions for compile -if(NOT WIN32) - target_link_libraries(graphxml_usage simgrid m ) -else() - target_link_libraries(graphxml_usage simgrid ) -endif() +add_executable (graphxml_usage graphxml_usage.c) +target_link_libraries(graphxml_usage simgrid ) set(tesh_files ${tesh_files} diff --git a/teshsuite/xbt/heap_bench/CMakeLists.txt b/teshsuite/xbt/heap_bench/CMakeLists.txt index d4cf170c36..c4f0451580 100644 --- a/teshsuite/xbt/heap_bench/CMakeLists.txt +++ b/teshsuite/xbt/heap_bench/CMakeLists.txt @@ -1,13 +1,5 @@ -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - -add_executable(heap_bench ${CMAKE_HOME_DIRECTORY}/teshsuite/xbt/heap_bench/heap_bench.c) - -### Add definitions for compile -if(NOT WIN32) - target_link_libraries(heap_bench simgrid m ) -else() - target_link_libraries(heap_bench simgrid ) -endif() +add_executable (heap_bench heap_bench.c) +target_link_libraries(heap_bench simgrid) set(tesh_files ${tesh_files} diff --git a/teshsuite/xbt/log_large/CMakeLists.txt b/teshsuite/xbt/log_large/CMakeLists.txt index 319a260b6a..71ad5a34c8 100644 --- a/teshsuite/xbt/log_large/CMakeLists.txt +++ b/teshsuite/xbt/log_large/CMakeLists.txt @@ -1,6 +1,4 @@ -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - -add_executable(log_large_test log_large_test.c) +add_executable (log_large_test log_large_test.c) target_link_libraries(log_large_test simgrid) set(tesh_files diff --git a/teshsuite/xbt/log_usage/CMakeLists.txt b/teshsuite/xbt/log_usage/CMakeLists.txt index 977aa2dff7..5f56e30b6c 100644 --- a/teshsuite/xbt/log_usage/CMakeLists.txt +++ b/teshsuite/xbt/log_usage/CMakeLists.txt @@ -1,13 +1,5 @@ -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - -add_executable(log_usage ${CMAKE_HOME_DIRECTORY}/teshsuite/xbt/log_usage/log_usage.c) - -### Add definitions for compile -if(NOT WIN32) - target_link_libraries(log_usage simgrid m ) -else() - target_link_libraries(log_usage simgrid ) -endif() +add_executable (log_usage log_usage.c) +target_link_libraries(log_usage simgrid) set(tesh_files ${tesh_files} diff --git a/teshsuite/xbt/mallocator/CMakeLists.txt b/teshsuite/xbt/mallocator/CMakeLists.txt index 8981832a7b..889c93e9c1 100644 --- a/teshsuite/xbt/mallocator/CMakeLists.txt +++ b/teshsuite/xbt/mallocator/CMakeLists.txt @@ -1,6 +1,4 @@ -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - -add_executable(mallocator mallocator_test.c) +add_executable (mallocator mallocator_test.c) target_link_libraries(mallocator simgrid) set(tesh_files diff --git a/teshsuite/xbt/mmalloc/CMakeLists.txt b/teshsuite/xbt/mmalloc/CMakeLists.txt index 12ef3cdcf7..e288687c91 100644 --- a/teshsuite/xbt/mmalloc/CMakeLists.txt +++ b/teshsuite/xbt/mmalloc/CMakeLists.txt @@ -1,7 +1,5 @@ -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - if(HAVE_MMALLOC) - add_executable(mmalloc_test mmalloc_test.c) + add_executable (mmalloc_test mmalloc_test.c) target_link_libraries(mmalloc_test simgrid) endif() diff --git a/teshsuite/xbt/parallel_log/CMakeLists.txt b/teshsuite/xbt/parallel_log/CMakeLists.txt index 37672a0d3e..8a4907a63f 100644 --- a/teshsuite/xbt/parallel_log/CMakeLists.txt +++ b/teshsuite/xbt/parallel_log/CMakeLists.txt @@ -1,6 +1,4 @@ -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - -add_executable(parallel_log_crashtest parallel_log_crashtest.c) +add_executable (parallel_log_crashtest parallel_log_crashtest.c) target_link_libraries(parallel_log_crashtest simgrid) set(tesh_files diff --git a/teshsuite/xbt/parmap_bench/CMakeLists.txt b/teshsuite/xbt/parmap_bench/CMakeLists.txt index d82fe5bbb3..87a8ce7653 100644 --- a/teshsuite/xbt/parmap_bench/CMakeLists.txt +++ b/teshsuite/xbt/parmap_bench/CMakeLists.txt @@ -1,13 +1,5 @@ -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - -add_executable(parmap_bench ${CMAKE_HOME_DIRECTORY}/teshsuite/xbt/parmap_bench/parmap_bench.c) - -### Add definitions for compile -if(NOT WIN32) - target_link_libraries(parmap_bench simgrid m ) -else() - target_link_libraries(parmap_bench simgrid ) -endif() +add_executable (parmap_bench parmap_bench.c) +target_link_libraries(parmap_bench simgrid) set(tesh_files ${tesh_files} diff --git a/teshsuite/xbt/parmap_test/CMakeLists.txt b/teshsuite/xbt/parmap_test/CMakeLists.txt index d75f385b58..2301a0c425 100644 --- a/teshsuite/xbt/parmap_test/CMakeLists.txt +++ b/teshsuite/xbt/parmap_test/CMakeLists.txt @@ -1,6 +1,4 @@ -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") - -add_executable(parmap_test parmap_test.c) +add_executable (parmap_test parmap_test.c) target_link_libraries(parmap_test simgrid) set(tesh_files diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index 30701d8f3a..2243e9c065 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -962,7 +962,6 @@ set(txt_files ) set(EXAMPLES_CMAKEFILES_TXT - examples/java/CMakeLists.txt examples/java/async/CMakeLists.txt examples/java/bittorrent/CMakeLists.txt examples/java/chord/CMakeLists.txt diff --git a/tools/cmake/MakeExe.cmake b/tools/cmake/MakeExe.cmake index 43efa54343..d426a86b32 100644 --- a/tools/cmake/MakeExe.cmake +++ b/tools/cmake/MakeExe.cmake @@ -2,7 +2,6 @@ ### Load all files declaring binaries (tools, examples and tests) # ################################################################### -add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/java) add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/java/async) add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/java/bittorrent) add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/java/chord) diff --git a/tools/cmake/Tests.cmake b/tools/cmake/Tests.cmake index d3d6c0a872..95edaeea06 100644 --- a/tools/cmake/Tests.cmake +++ b/tools/cmake/Tests.cmake @@ -525,7 +525,7 @@ ENDIF() ## OTHER ## -ADD_TEST(testall ${CMAKE_BINARY_DIR}/src/testall) +ADD_TEST(testall ${CMAKE_BINARY_DIR}/testall) IF(enable_auto_install) ADD_TEST(simgrid_install make install) diff --git a/tools/cmake/UnitTesting.cmake b/tools/cmake/UnitTesting.cmake index b3ee0322ae..cbbd15c2f6 100644 --- a/tools/cmake/UnitTesting.cmake +++ b/tools/cmake/UnitTesting.cmake @@ -58,12 +58,6 @@ ADD_CUSTOM_COMMAND( set_source_files_properties(${TEST_UNITS} PROPERTIES GENERATED true) -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}/src/") -add_executable(testall ${TEST_UNITS}) +add_executable (testall ${TEST_UNITS}) +target_link_libraries(testall simgrid) -### Add definitions for compile -if(NOT WIN32) - target_link_libraries(testall simgrid m) -else() - target_link_libraries(testall simgrid) -endif() diff --git a/tools/graphicator/CMakeLists.txt b/tools/graphicator/CMakeLists.txt index 7b8fe651f4..c7d2e010fd 100644 --- a/tools/graphicator/CMakeLists.txt +++ b/tools/graphicator/CMakeLists.txt @@ -1,13 +1,5 @@ -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_BINARY_DIR}/bin") - -add_executable(graphicator graphicator.c) - -### Add definitions for compile -if(NOT WIN32) - target_link_libraries(graphicator simgrid m pthread ) -else() - target_link_libraries(graphicator simgrid ) -endif() +add_executable (graphicator graphicator.c) +target_link_libraries(graphicator simgrid) ## Clean generated files get_directory_property(extra_clean_files ADDITIONAL_MAKE_CLEAN_FILES)