Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
various cleanups in the CMakeLists.txt files
authorMartin Quinson <martin.quinson@loria.fr>
Tue, 23 Feb 2016 10:49:59 +0000 (11:49 +0100)
committerMartin Quinson <martin.quinson@loria.fr>
Tue, 23 Feb 2016 12:37:38 +0000 (13:37 +0100)
- 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

163 files changed:
.gitignore
doc/doxygen/inside_tests.doc
examples/java/CMakeLists.txt [deleted file]
examples/java/async/CMakeLists.txt
examples/java/bittorrent/CMakeLists.txt
examples/java/chord/CMakeLists.txt
examples/java/cloud/CMakeLists.txt
examples/java/cloud/energy/CMakeLists.txt
examples/java/cloud/migration/CMakeLists.txt
examples/java/commTime/CMakeLists.txt
examples/java/energy/CMakeLists.txt
examples/java/io/CMakeLists.txt
examples/java/kademlia/CMakeLists.txt
examples/java/master_slave_bypass/CMakeLists.txt
examples/java/master_slave_kill/CMakeLists.txt
examples/java/masterslave/CMakeLists.txt
examples/java/migration/CMakeLists.txt
examples/java/mutualExclusion/CMakeLists.txt
examples/java/pingPong/CMakeLists.txt
examples/java/priority/CMakeLists.txt
examples/java/startKillTime/CMakeLists.txt
examples/java/suspend/CMakeLists.txt
examples/java/tracing/CMakeLists.txt
examples/msg/actions/CMakeLists.txt
examples/msg/bittorrent/CMakeLists.txt
examples/msg/chainsend/CMakeLists.txt
examples/msg/chord/CMakeLists.txt
examples/msg/cloud/CMakeLists.txt
examples/msg/energy/consumption/CMakeLists.txt
examples/msg/energy/onoff/CMakeLists.txt
examples/msg/energy/pstate/CMakeLists.txt
examples/msg/energy/vm/CMakeLists.txt
examples/msg/exception/CMakeLists.txt
examples/msg/gpu/CMakeLists.txt
examples/msg/gtnets/CMakeLists.txt
examples/msg/icomms/CMakeLists.txt
examples/msg/io/CMakeLists.txt
examples/msg/kademlia/CMakeLists.txt
examples/msg/masterslave/CMakeLists.txt
examples/msg/mc/CMakeLists.txt
examples/msg/migration/CMakeLists.txt
examples/msg/ns3/CMakeLists.txt
examples/msg/parallel_task/CMakeLists.txt
examples/msg/pastry/CMakeLists.txt
examples/msg/pmm/CMakeLists.txt
examples/msg/priority/CMakeLists.txt
examples/msg/properties/CMakeLists.txt
examples/msg/semaphores/CMakeLists.txt
examples/msg/sendrecv/CMakeLists.txt
examples/msg/start_kill_time/CMakeLists.txt
examples/msg/suspend/CMakeLists.txt
examples/msg/token_ring/CMakeLists.txt
examples/msg/tracing/CMakeLists.txt
examples/s4u/README
examples/s4u/basic/CMakeLists.txt
examples/s4u/io/CMakeLists.txt
examples/simdag/CMakeLists.txt
examples/simdag/dax/CMakeLists.txt
examples/simdag/dot/CMakeLists.txt
examples/simdag/goal/CMakeLists.txt
examples/simdag/io/CMakeLists.txt
examples/simdag/properties/CMakeLists.txt
examples/simdag/scheduling/CMakeLists.txt
examples/smpi/CMakeLists.txt
examples/smpi/MM/CMakeLists.txt
examples/smpi/energy/CMakeLists.txt
examples/smpi/energy/f77/CMakeLists.txt
examples/smpi/energy/f90/CMakeLists.txt
examples/smpi/replay_multiple/CMakeLists.txt
examples/smpi/smpi_msg_masterslave/CMakeLists.txt
src/surf/xml/simgrid_dtd.c
teshsuite/bug-17132/CMakeLists.txt
teshsuite/java/semaphore/CMakeLists.txt
teshsuite/java/sleep_host_off/CMakeLists.txt
teshsuite/mc/CMakeLists.txt
teshsuite/mc/dwarf/CMakeLists.txt
teshsuite/mc/dwarf_expression/CMakeLists.txt
teshsuite/mc/replay/CMakeLists.txt
teshsuite/msg/get_sender/CMakeLists.txt
teshsuite/msg/host_on_off/CMakeLists.txt
teshsuite/msg/host_on_off_processes/CMakeLists.txt
teshsuite/msg/pid/CMakeLists.txt
teshsuite/msg/process/CMakeLists.txt
teshsuite/msg/process_join/CMakeLists.txt
teshsuite/msg/storage/CMakeLists.txt
teshsuite/msg/task_destroy_cancel/CMakeLists.txt
teshsuite/msg/trace/CMakeLists.txt
teshsuite/simdag/availability/CMakeLists.txt
teshsuite/simdag/basic/CMakeLists.txt
teshsuite/simdag/incomplete/CMakeLists.txt
teshsuite/simdag/network/mxn/CMakeLists.txt
teshsuite/simdag/network/p2p/CMakeLists.txt
teshsuite/simdag/partask/CMakeLists.txt
teshsuite/simdag/platforms/CMakeLists.txt
teshsuite/simix/check_defaults/CMakeLists.txt
teshsuite/simix/stack_overflow/CMakeLists.txt
teshsuite/smpi/CMakeLists.txt
teshsuite/smpi/allgather/CMakeLists.txt
teshsuite/smpi/allgatherv/CMakeLists.txt
teshsuite/smpi/allreduce/CMakeLists.txt
teshsuite/smpi/alltoall/CMakeLists.txt
teshsuite/smpi/alltoallv/CMakeLists.txt
teshsuite/smpi/barrier/CMakeLists.txt
teshsuite/smpi/bcast/CMakeLists.txt
teshsuite/smpi/compute/CMakeLists.txt
teshsuite/smpi/gather/CMakeLists.txt
teshsuite/smpi/hvector/CMakeLists.txt
teshsuite/smpi/indexed/CMakeLists.txt
teshsuite/smpi/isp/umpire/CMakeLists.txt
teshsuite/smpi/mpich3-test/CMakeLists.txt
teshsuite/smpi/mpich3-test/attr/CMakeLists.txt
teshsuite/smpi/mpich3-test/coll/CMakeLists.txt
teshsuite/smpi/mpich3-test/comm/CMakeLists.txt
teshsuite/smpi/mpich3-test/datatype/CMakeLists.txt
teshsuite/smpi/mpich3-test/f77/attr/CMakeLists.txt
teshsuite/smpi/mpich3-test/f77/coll/CMakeLists.txt
teshsuite/smpi/mpich3-test/f77/comm/CMakeLists.txt
teshsuite/smpi/mpich3-test/f77/datatype/CMakeLists.txt
teshsuite/smpi/mpich3-test/f77/ext/CMakeLists.txt
teshsuite/smpi/mpich3-test/f77/info/CMakeLists.txt
teshsuite/smpi/mpich3-test/f77/init/CMakeLists.txt
teshsuite/smpi/mpich3-test/f77/pt2pt/CMakeLists.txt
teshsuite/smpi/mpich3-test/f77/rma/CMakeLists.txt
teshsuite/smpi/mpich3-test/f77/topo/CMakeLists.txt
teshsuite/smpi/mpich3-test/f77/util/CMakeLists.txt
teshsuite/smpi/mpich3-test/f90/coll/CMakeLists.txt
teshsuite/smpi/mpich3-test/f90/datatype/CMakeLists.txt
teshsuite/smpi/mpich3-test/f90/info/CMakeLists.txt
teshsuite/smpi/mpich3-test/f90/init/CMakeLists.txt
teshsuite/smpi/mpich3-test/f90/pt2pt/CMakeLists.txt
teshsuite/smpi/mpich3-test/f90/rma/CMakeLists.txt
teshsuite/smpi/mpich3-test/f90/util/CMakeLists.txt
teshsuite/smpi/mpich3-test/group/CMakeLists.txt
teshsuite/smpi/mpich3-test/info/CMakeLists.txt
teshsuite/smpi/mpich3-test/init/CMakeLists.txt
teshsuite/smpi/mpich3-test/perf/CMakeLists.txt
teshsuite/smpi/mpich3-test/pt2pt/CMakeLists.txt
teshsuite/smpi/mpich3-test/rma/CMakeLists.txt
teshsuite/smpi/mpich3-test/topo/CMakeLists.txt
teshsuite/smpi/pingpong/CMakeLists.txt
teshsuite/smpi/reduce/CMakeLists.txt
teshsuite/smpi/scatter/CMakeLists.txt
teshsuite/smpi/shared/CMakeLists.txt
teshsuite/smpi/struct/CMakeLists.txt
teshsuite/smpi/vector/CMakeLists.txt
teshsuite/surf/lmm_usage/CMakeLists.txt
teshsuite/surf/maxmin_bench/CMakeLists.txt
teshsuite/surf/surf_usage/CMakeLists.txt
teshsuite/surf/trace_usage/CMakeLists.txt
teshsuite/xbt/graphxml_usage/CMakeLists.txt
teshsuite/xbt/heap_bench/CMakeLists.txt
teshsuite/xbt/log_large/CMakeLists.txt
teshsuite/xbt/log_usage/CMakeLists.txt
teshsuite/xbt/mallocator/CMakeLists.txt
teshsuite/xbt/mmalloc/CMakeLists.txt
teshsuite/xbt/parallel_log/CMakeLists.txt
teshsuite/xbt/parmap_bench/CMakeLists.txt
teshsuite/xbt/parmap_test/CMakeLists.txt
tools/cmake/DefinePackages.cmake
tools/cmake/MakeExe.cmake
tools/cmake/Tests.cmake
tools/cmake/UnitTesting.cmake
tools/graphicator/CMakeLists.txt

index be91017..7f72396 100644 (file)
@@ -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
index ca1b7ed..857183e 100644 (file)
@@ -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 (file)
index 94da85f..0000000
+++ /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)
-
index 6aa09fe..5af0c74 100644 (file)
@@ -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(
index 6d7c80e..04310a5 100644 (file)
@@ -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(
index f56a6da..6c5e10b 100644 (file)
@@ -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(
index 9a64392..f42a738 100644 (file)
@@ -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(
index b02fcf6..bcc3e9a 100644 (file)
@@ -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(
index 4cd57c4..8c94c6d 100644 (file)
@@ -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(
index 5014ac6..295bc9c 100644 (file)
@@ -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(
index 2ad4d43..527fb65 100644 (file)
@@ -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(
index c761d3b..a4e792a 100644 (file)
@@ -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(
index 5767cd2..5289ac8 100644 (file)
@@ -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(
index 7ed961f..fbb6934 100644 (file)
@@ -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(
index 1c6971f..69b7f07 100644 (file)
@@ -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(
index 3dabea0..b6d3b6e 100644 (file)
@@ -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(
index 27a2553..ddd0580 100644 (file)
@@ -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(
index 02048a8..c7f9ee0 100644 (file)
@@ -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(
index 1132494..2c61823 100644 (file)
@@ -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(
index 1eb9ee4..8cb21fb 100644 (file)
@@ -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(
index 1a1bdc5..9f6f8d8 100644 (file)
@@ -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(
index d978b49..eb6ce3e 100644 (file)
@@ -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(
index e21c754..8949861 100644 (file)
@@ -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(
index 071af06..29a83d0 100644 (file)
@@ -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
index ef1d6ec..322e8dc 100644 (file)
@@ -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}
index 072a61f..773c0cb 100644 (file)
@@ -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}
index 15c131e..c0a4dd8 100644 (file)
@@ -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}
index f32d0d9..0ff9719 100644 (file)
@@ -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}
index 687973b..5869c14 100644 (file)
@@ -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
index 73c7813..3832f22 100644 (file)
@@ -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}
index 80e3ab8..98706ad 100644 (file)
@@ -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}
index f0451c9..982bc54 100644 (file)
@@ -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
index ba40be2..229288e 100644 (file)
@@ -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
index f5e9f77..eb137cf 100644 (file)
@@ -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)
index e1f1c49..9f6fe78 100644 (file)
@@ -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
index af87b61..306390f 100644 (file)
@@ -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
index 558580c..c21e18d 100644 (file)
@@ -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}
index fd295b5..c7e8dcc 100644 (file)
@@ -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}
index 8e54c3e..bd7a720 100644 (file)
@@ -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}
index 4361496..c3b7268 100644 (file)
@@ -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()
index ea96ff4..fbb9b8c 100644 (file)
@@ -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}
index fd2349b..9765d82 100644 (file)
@@ -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
index d993ee4..9928fd2 100644 (file)
@@ -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}
index b071ef5..3bd6d38 100644 (file)
@@ -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}
index c28e689..330bf98 100644 (file)
@@ -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}
index 298eeef..a1e0d3d 100644 (file)
@@ -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
index 1c70616..7a047e1 100644 (file)
@@ -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
index fd337d8..17c4629 100644 (file)
@@ -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
index 2f225fc..d9597cc 100644 (file)
@@ -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}
index bae4251..37d3069 100644 (file)
@@ -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}
index 9126d38..119df72 100644 (file)
@@ -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}
index 75f9151..26d0fcb 100644 (file)
@@ -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}
index 8cdba72..4711217 100644 (file)
@@ -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)
index 0b54715..48f7ff4 100644 (file)
@@ -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
index 5d2c207..272b302 100644 (file)
@@ -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
index 7fdeb48..d61f16b 100644 (file)
@@ -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
index bd57c5b..126e7f5 100644 (file)
@@ -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}
index 77dafa0..bac344e 100644 (file)
@@ -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
index c45b57c..9e81450 100644 (file)
@@ -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
index d0f13f5..2887013 100644 (file)
@@ -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
index 3f4db61..f1e63b1 100644 (file)
@@ -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
index e0fc82d..892fff8 100644 (file)
@@ -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
index 219282d..70d8da4 100644 (file)
@@ -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
index 6476a6b..9f1788a 100644 (file)
@@ -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()
 
index ec352cc..4438eec 100644 (file)
@@ -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()
 
index c77983e..5371423 100644 (file)
@@ -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()
 
index 976640d..3b503c4 100644 (file)
@@ -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()
 
index b96c097..d604ad6 100644 (file)
@@ -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()
 
index 601ce27..cd9186c 100644 (file)
@@ -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()
 
index 787fd28..62fee2c 100644 (file)
@@ -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()
 
index c8b3eee..98e7e1c 100644 (file)
@@ -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
index 5247795..84e79b1 100644 (file)
@@ -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)
 
index 1469e80..13fdffc 100644 (file)
@@ -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(
index 5f3db60..5ab4ad8 100644 (file)
@@ -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(
index 73d251e..6a38e8b 100644 (file)
@@ -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)
 
index 7edcfc5..904cafb 100644 (file)
@@ -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()
 
index ce37b27..e17889e 100644 (file)
@@ -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()
 
index e768581..9bfb7ad 100644 (file)
@@ -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
index 7141cba..d4cef67 100644 (file)
@@ -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
index 776a811..2f60d1e 100644 (file)
@@ -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()
 
index 166f781..91946d3 100644 (file)
@@ -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
index c8c0e90..988789a 100644 (file)
@@ -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}
index 685c635..9034065 100644 (file)
@@ -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
index 883aa86..adb7cac 100644 (file)
@@ -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
index be971df..68bc0d8 100644 (file)
@@ -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}
index 716f4be..bfcd350 100644 (file)
@@ -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
index e7663b6..f7c52b2 100644 (file)
@@ -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
index 05cdb9c..798d88a 100644 (file)
@@ -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
index 69af506..2fd0417 100644 (file)
@@ -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
index d62eb99..c742098 100644 (file)
@@ -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
index 7c60a4b..2d536b6 100644 (file)
@@ -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}
index 5f68137..931f2e0 100644 (file)
@@ -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
index 176ea1e..bf3a960 100644 (file)
@@ -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
index 89f52e4..e4ccbac 100644 (file)
@@ -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}
index 4fcacc6..956573c 100644 (file)
@@ -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
index ed9b2cc..4547f05 100644 (file)
@@ -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
index 0f9d37f..00b7004 100644 (file)
@@ -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
index 461a767..115a521 100644 (file)
@@ -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()
 
index 357400d..e5f1e63 100644 (file)
@@ -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()
 
index da60278..3db2745 100644 (file)
@@ -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()
 
index e4d3721..be01542 100644 (file)
@@ -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()
 
 
index b4b1f75..513de64 100644 (file)
@@ -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()
 
index 6bef622..fffb3ad 100644 (file)
@@ -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()
 
index 8082f5b..9789588 100644 (file)
@@ -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()
 
index d3d1510..51849df 100644 (file)
@@ -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()
 
index 24e2bfa..4918607 100644 (file)
@@ -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()
 
index 30f167a..5bea7ba 100644 (file)
@@ -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()
 
index 116a9de..c0b9b2e 100644 (file)
@@ -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()
 
index 1200f99..5402549 100644 (file)
@@ -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} )
index af1878e..4e912b9 100644 (file)
@@ -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/")
 
index 6b0070d..90eba93 100644 (file)
@@ -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/")
 
index 50c3974..5357639 100644 (file)
@@ -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/")
 
index 0621e16..07b3936 100644 (file)
@@ -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/")
 
index 7c92987..f5229fc 100644 (file)
@@ -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/")
 
index f15b0cd..013b1c2 100644 (file)
@@ -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/")
 
index 74459dc..d8e0cd7 100644 (file)
@@ -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/")
 
index 9882a17..7ec483b 100644 (file)
@@ -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/")
 
index fc2942a..26b871a 100644 (file)
@@ -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/")
 
index 6de863c..858c661 100644 (file)
@@ -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/")
 
index d47edb7..312c945 100644 (file)
@@ -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/")
 
index 6d7fda3..d96353a 100644 (file)
@@ -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/")
 
index 3dfc6c4..db09537 100644 (file)
@@ -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/")
 
index d5b57fd..5231aa5 100644 (file)
@@ -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/")
 
index 1258e4a..8ec623e 100644 (file)
@@ -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/")
 
index e853598..15a52a7 100644 (file)
@@ -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/")
 
index 7d29837..247b492 100644 (file)
@@ -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)
index cdedaad..e7f7e95 100644 (file)
@@ -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)
index b782197..e70c7a0 100644 (file)
@@ -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)
index de127c5..1cb8e90 100644 (file)
@@ -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)
index d293207..5045e56 100644 (file)
@@ -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)
index 720c473..2572c4b 100644 (file)
@@ -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/")
 
index 9abba67..a488dab 100644 (file)
@@ -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
index 4752ea1..0f890fe 100644 (file)
@@ -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/")
 
index 259cdd9..e2528f5 100644 (file)
@@ -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/")
 
index 9066dc2..8a0e2d3 100644 (file)
@@ -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/")
 
index 686fe1b..60ab82a 100644 (file)
@@ -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/")
 
index 4ca54a0..3fe7256 100644 (file)
@@ -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/")
 
index ec4fdaa..ae1f882 100644 (file)
@@ -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/")
index 3a9fd06..3677016 100644 (file)
@@ -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/")
 
index dc15032..f4d90cb 100644 (file)
@@ -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
index 651fa42..af3df4d 100644 (file)
@@ -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()
 
index 7388027..001cd62 100644 (file)
@@ -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()
 
index 517ce09..2c9be7d 100644 (file)
@@ -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()
index a410060..3f0cb7e 100644 (file)
@@ -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()
 
index b356e78..9d8960c 100644 (file)
@@ -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()
 
index 0f1b817..78d0d16 100644 (file)
@@ -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}
index 429e117..17752d7 100644 (file)
@@ -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}
index 1ac7848..76f38b4 100644 (file)
@@ -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}
index 09c918a..1bf1224 100644 (file)
@@ -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}
index 1d6f8b3..46a11ec 100644 (file)
@@ -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}
index d4cf170..c4f0451 100644 (file)
@@ -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}
index 319a260..71ad5a3 100644 (file)
@@ -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
index 977aa2d..5f56e30 100644 (file)
@@ -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}
index 8981832..889c93e 100644 (file)
@@ -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
index 12ef3cd..e288687 100644 (file)
@@ -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()
 
index 37672a0..8a4907a 100644 (file)
@@ -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
index d82fe5b..87a8ce7 100644 (file)
@@ -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}
index d75f385..2301a0c 100644 (file)
@@ -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
index 30701d8..2243e9c 100644 (file)
@@ -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
index 43efa54..d426a86 100644 (file)
@@ -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)
index d3d6c0a..95edaee 100644 (file)
@@ -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)
index b3ee032..cbbd15c 100644 (file)
@@ -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()
index 7b8fe65..c7d2e01 100644 (file)
@@ -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)