From c32b0efb4d60542f91bc9257eed2b56fe0d421e1 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Thu, 3 Oct 2013 21:46:33 +0200 Subject: [PATCH] Slight reordering. --- buildtools/Cmake/MakeExe.cmake | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/buildtools/Cmake/MakeExe.cmake b/buildtools/Cmake/MakeExe.cmake index f4c260f58e..d3c78d3683 100644 --- a/buildtools/Cmake/MakeExe.cmake +++ b/buildtools/Cmake/MakeExe.cmake @@ -1,13 +1,6 @@ ################################################################### ### Load all files declaring binaries (tools, examples and tests) # ################################################################### -################################################################## -# Those CMakelists are just added to define files in dist # -add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/lua) -add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg) -add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/xbt) -add_subdirectory(${CMAKE_HOME_DIRECTORY}/tools) -################################################################## add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/java) add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/java/async) @@ -28,11 +21,17 @@ add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/java/startKillTime) add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/java/suspend) add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/java/tracing) +add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/lua) + +add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg) add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/actions) add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/bittorrent) add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/chainsend) add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/chord) add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/cloud) +add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/energy/e1) +add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/energy/e2) +add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/energy/e3) add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/gpu) add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets) add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/icomms) @@ -59,10 +58,6 @@ add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/scala/master_slave_bypass) add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/scala/master_slave_kill) add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/scala/masterslave) -add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/energy/e1) -add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/energy/e2) -add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/energy/e3) - add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/simdag) add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/simdag/dax) add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/simdag/dot) @@ -75,9 +70,12 @@ add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/simdag/scheduling) add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/smpi) add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/smpi/MM) +add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/xbt) + add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/msg) -add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/msg/trace) add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/msg/storage) +add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/msg/trace) + add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/simdag) add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/availability) add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/network) @@ -85,11 +83,12 @@ add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/network/mxn) add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/network/p2p) add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/partask) add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms) + add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi) add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test) add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/attr) -add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/comm) add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/coll) +add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/comm) add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/datatype) add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/group) add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/init) @@ -108,8 +107,10 @@ add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/f90/init) add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/f90/pt2pt) add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/xbt) + add_subdirectory(${CMAKE_HOME_DIRECTORY}/testsuite/surf) add_subdirectory(${CMAKE_HOME_DIRECTORY}/testsuite/xbt) -add_subdirectory(${CMAKE_HOME_DIRECTORY}/tools/graphicator/) +add_subdirectory(${CMAKE_HOME_DIRECTORY}/tools) +add_subdirectory(${CMAKE_HOME_DIRECTORY}/tools/graphicator) add_subdirectory(${CMAKE_HOME_DIRECTORY}/tools/tesh) -- 2.20.1