From: navarrop Date: Tue, 23 Mar 2010 14:30:46 +0000 (+0000) Subject: Massive mv to use cmake as the default compilation infrastructure. X-Git-Tag: SVN~419 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/963aa331797f0bc1a8173af4b3970205bcbfbd0c?ds=sidebyside Massive mv to use cmake as the default compilation infrastructure. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7320 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- diff --git a/buildtools/Cmake/simgrid_CMakeList/CMakeLists.txt b/CMakeLists.txt similarity index 100% rename from buildtools/Cmake/simgrid_CMakeList/CMakeLists.txt rename to CMakeLists.txt diff --git a/doc/FAQ.doc b/doc/FAQ.doc index 4a448d5a2e..602c0ed69b 100644 --- a/doc/FAQ.doc +++ b/doc/FAQ.doc @@ -135,8 +135,8 @@ make make install \endverbatim -If at some point, something fails, check the section "\ref -faq_trouble_compil". If it does not help, you can report this problem to the +If at some point, something fails, check the section \ref faq_trouble_compil . +If it does not help, you can report this problem to the list but, please, avoid sending a laconic mail like "There is a problem. Is it okay?". Send the config.log file which is automatically generated by configure. Try to capture both the standard output and the error output of the @@ -366,6 +366,562 @@ If you use the GRAS interface instead of the MSG one, then previous section is not the better source of information. Instead, you should check the GRAS tutorial in general, and the \ref GRAS_tut_tour_setup in particular. +\section faq_cmake CMAKE + +\subsection faq_intro Some generalitty + +\subsubsection faq_intro1 What is Cmake? + +CMake is a family of tools designed to build, test and package software. CMake is used to control the software compilation process using simple platform and compiler independent configuration files. CMake generates native makefiles and workspaces that can be used in the compiler environment of your choice. For more information see official web site here. + +\subsubsection faq_intro2 Why cmake? + +CMake permits to developers to compil projects on different plateform. Then many tools are embedded like ctest for making test, a link to cdash for vizualise results but also test coverage and bug reports. + +\subsubsection faq_intro3 What cmake need? + +CMake needs some prerequists like : + \li make + \li c, c++ and java compiler regards to developers + \li ccmake for graphical used of CMake + \li cmake (download page) + +\subsubsection faq_intro4 Cmake vs Autotools... + + + +\subsection faq_cmakeoption Cmake options + +\subsubsection faq_cmakeoption1 Liste of options + +\verbatim +"cmake -D[name]=[value] ... ./" + +[name] disable_gtnets [value] ON/OFF or TRUE/FALSE or 1/0 + disable_java ON/OFF or TRUE/FALSE or 1/0 + disable_lua ON/OFF or TRUE/FALSE or 1/0 + disable_ruby ON/OFF or TRUE/FALSE or 1/0 + + enable_compile_optimizations ON/OFF or TRUE/FALSE or 1/0 + enable_compile_warnings ON/OFF or TRUE/FALSE or 1/0 + enable_maintainer_mode ON/OFF or TRUE/FALSE or 1/0 + + supernovae ON/OFF or TRUE/FALSE or 1/0 + + gtnets_path + prefix + with_context auto/ucontext/pthread/window +\endverbatim + +\subsubsection faq_cmakeoption2 Options explaination + + \li disable_gtnets : set to true implie that user doesn't want to use gtnets. + + \li disable_java : set to true implie that user doesn't want to add java langage into simgrid compilation. + + \li disable_lua : set to true implie that user doesn't want to add lua langage into simgrid compilation. + + \li disable_ruby : set to true implie that user doesn't want to add ruby langage into simgrid compilation. + + \li enable_compile_optimizations : add flags "-O3 -finline-functions -funroll-loops -fno-strict-aliasing" + + \li enable_compile_warnings : add flags "-Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wpointer-arith -Wchar-subscripts -Wcomment -Wformat -Wwrite-strings -Wno-unused-function -Wno-unused-parameter -Wno-strict-aliasing -Wno-format-nonliteral -Werror" + + \li enable_maintainer_mode : set to true make doc and remake files with flex flexml. +\verbatim +/doc/html +/src/gras/DataDesc/ddt_parse.yy.c +/src/surf/simgrid_dtd.c +/src/xbt/graphxml.c +/src/simdag/dax_dtd.c +/include/surf/simgrid_dtd.h +/include/xbt/graphxml.h +/src/simdag/dax_dtd.h +\endverbatim + \li supernovae : set to true make one file for each lib and compile with those generated files. +\verbatim +/src/supernovae_sg.c +/src/supernovae_gras.c +/src/supernovae_smpi.c +\endverbatim + \li gtnets_path : Path to gtnets install directory (ex /usr) + + \li prefix : Path where are installed lib/ doc/ and include/ directories (ex /usr/local) + + \li with context : specify which context the user wants to use. + +\subsubsection faq_cmakeoption3 Initialisation + +Those options are initialized the first time you launch \"cmake ./\" whithout specified option. + +\verbatim +with_context auto +enable_maintainer_mode off +supernovae off +disable_java off +disable_lua off +enable_compile_warnings off +enable_compile_optimizations off +disable_gtnets off +disable_ruby on +\endverbatim + +\subsubsection faq_cmakeoption4 Option's cache and how to reset? + +When options have been set they are keep into a cache file named \"CMakeCache.txt\". So if you want +reset values you just delete this file located to the project directory. + +\subsection faq_cmakecompilation Cmake compilation + +\subsubsection faq_cmakecompilation1 With command line. + +\verbatim +cmake -D[name]=[value] ... ./ +make +\endverbatim + +\subsubsection faq_cmakecompilation2 With ccmake tool. + +\verbatim +"ccmake ./" +\endverbatim +Then follow instructions. + +\subsubsection faq_cmakecompilation3 Resume of command line + + \li CMake +\verbatim +cmake ./ configure the project +make build all tagets +make test test all targets and summarize +make package make the distrib +make install-simgrid install the project (doc/ lib/ include/) +make clean" clean all targets +\endverbatim + +When the project have been succesfully compiling and build you can make tests. + + \li CTest +\verbatim +ctest launch only tests +ctest -D Continuous +ctest -D Continuous(Start|Update|Configure|Build) +ctest -D Continuous(Test|Coverage|MemCheck|Submit) +ctest -D Experimental +ctest -D Experimental(Start|Update|Configure|Build) +ctest -D Experimental(Test|Coverage|MemCheck|Submit) +ctest -D Nightly +ctest -D Nightly(Start|Update|Configure|Build) +ctest -D Nightly(Test|Coverage|MemCheck|Submit) +ctest -D NightlyMemoryCheck +\endverbatim + +\subsubsection faq_cmakecompilation4 Examples for different mode. + +\li Mode maintainer + +cmake -Denable_maintainer_mode=on ./ +\verbatim GTnetS doesn't works : set -Ddisable_gtnets=on +with_context auto change to ucontext +(skaddr) +(sksize) +Make : src/simgrid.jar with : /usr/bin/javac +Make examples/java with : /usr/bin/javac + +Configuration of package `simgrid' (revision 7228M) on arch (=4): + BUILDNAME : UCONTEXT + SITE : Linux_Ubuntu 9.10_x86_64 + + Compiler: c++ : /usr/bin/c++ + version: c++ (Ubuntu 4.4.1-4ubuntu9) 4.4.1 + c : /usr/bin/gcc + version: gcc (Ubuntu 4.4.1-4ubuntu9) 4.4.1 + + CFlags: -g3 + CPPFlags: + LDFlags: + + Context backend: ucontext + Compile Gtnets: 0 + path: + Compile Java: 1 + Compile Lua: 1 + Compile Ruby: 0 + + Maintainer mode: on + Supernovae mode: off + + Simgrid dependencies: dl -llua5.1 + Gras dependencies: pthread + Ruby dependencies: + Smpi dependencies: + + USER_PREFIX: /usr/local + INSTALL_PREFIX: /usr/local + +-- Configuring done +-- Generating done +-- Build files have been written to: /home/navarrop/Bureau/simgrid-trunk +\endverbatim + +\li Mode supernovae + +cmake -Dsupernovae=on ./ +\verbatim GTnetS doesn't works : set -Ddisable_gtnets=on +with_context auto change to ucontext +(skaddr) +(sksize) +Make : src/simgrid.jar with : /usr/bin/javac +Make examples/java with : /usr/bin/javac + +Configuration of package `simgrid' (revision 7228M) on arch (=4): + BUILDNAME : SUPERNOVAE + SITE : Linux_Ubuntu 9.10_x86_64 + + Compiler: c++ : /usr/bin/c++ + version: c++ (Ubuntu 4.4.1-4ubuntu9) 4.4.1 + c : /usr/bin/gcc + version: gcc (Ubuntu 4.4.1-4ubuntu9) 4.4.1 + + CFlags: -O3 -finline-functions -funroll-loops -fno-strict-aliasing -Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wpointer-arith -Wchar-subscripts -Wcomment -Wformat -Wwrite-strings -Wno-unused-function -Wno-unused-parameter -Wno-strict-aliasing -Wno-format-nonliteral -Werror -g3 + CPPFlags: + LDFlags: + + Context backend: ucontext + Compile Gtnets: 0 + path: + Compile Java: 1 + Compile Lua: 1 + Compile Ruby: 0 + + Maintainer mode: off + Supernovae mode: on + + Simgrid dependencies: dl -llua5.1 + Gras dependencies: pthread + Ruby dependencies: + Smpi dependencies: + + USER_PREFIX: /usr/local + INSTALL_PREFIX: /usr/local + +-- Configuring done +-- Generating done +-- Build files have been written to: /home/navarrop/Bureau/simgrid-trunk +\endverbatim + +\li Mode GTnetS + +cmake -Dgtnets_path=/home/navarrop/Bureau/usr/ ./ +\verbatim with_context auto change to ucontext +(skaddr) +(sksize) +Make : src/simgrid.jar with : /usr/bin/javac +Make examples/java with : /usr/bin/javac + +Configuration of package `simgrid' (revision 7228M) on arch (=4): + BUILDNAME : GTNETS + SITE : Linux_Ubuntu 9.10_x86_64 + + Compiler: c++ : /usr/bin/c++ + version: c++ (Ubuntu 4.4.1-4ubuntu9) 4.4.1 + c : /usr/bin/gcc + version: gcc (Ubuntu 4.4.1-4ubuntu9) 4.4.1 + + CFlags: -L/home/navarrop/Bureau/usr/lib -I/home/navarrop/Bureau/usr/include/gtnets -g3 + CPPFlags: -L/home/navarrop/Bureau/usr/lib -I/home/navarrop/Bureau/usr/include/gtnets + LDFlags: + + Context backend: ucontext + Compile Gtnets: 1 + path: /home/navarrop/Bureau/usr + Compile Java: 1 + Compile Lua: 1 + Compile Ruby: 0 + + Maintainer mode: off + Supernovae mode: off + + Simgrid dependencies: dl -llua5.1 -lgtnets + Gras dependencies: pthread + Ruby dependencies: + Smpi dependencies: + + USER_PREFIX: /usr/local + INSTALL_PREFIX: /usr/local + +INFO -->> Take care to have export LD_LIBRARY_PATH before run make command for make examples with gtnets +copy and paste : export LD_LIBRARY_PATH=/home/navarrop/Bureau/usr/lib/:$LD_LIBRARY_PATH + + +-- Configuring done +-- Generating done +-- Build files have been written to: /home/navarrop/Bureau/simgrid-trunk +\endverbatim + +\subsection faq_cmakeinstall How to install with cmake? + +\subsubsection faq_cmakeinstall1 From svn. + +\verbatim +cmake -Denable_maintainer_mode=on -Dprefix=/home/navarrop/Bureau/install_simgrid ./ +make +make install-simgrid +\endverbatim + +\subsubsection faq_cmakeinstall2 From a distrib + +\verbatim +cmake -Dprefix=/home/navarrop/Bureau/install_simgrid ./ +make +make install-simgrid +\endverbatim + +\subsection faq_screenshot Screenshot + +\verbatim +navarrop@caraja:~$ cd Bureau/simgrid-trunk/ +navarrop@caraja:~/Bureau/simgrid-trunk$ cmake ./ + +GTnetS doesn't works : set -Ddisable_gtnets=on <-|some warnings are printed +with_context auto change to ucontext <-| +(skaddr) <--info (needed) +(sksize) <--info (needed) +Make : src/simgrid.jar with : /usr/bin/javac <--info (if java) +Make examples/java with : /usr/bin/javac <--info (if java) + +Configuration of package `simgrid' (revision 7209M) on arch (=4): + BUILDNAME : UCONTEXT <-- name of the compilation regarding to cdash + SITE : Linux_Ubuntu 9.10_x86_64 <-- distribution of the local machine regarding to cdash + + Compiler: c++ : /usr/bin/c++ + version: c++ (Ubuntu 4.4.1-4ubuntu9) 4.4.1 + c : /usr/bin/gcc + version: gcc (Ubuntu 4.4.1-4ubuntu9) 4.4.1 + + CFlags: -g3 + CPPFlags: + LDFlags: + + Context backend: ucontext + Compile Gtnets: 0 + path: + Compile Java: 1 + Compile Lua: 1 + Compile Ruby: 0 + + Maintainer mode: OFF + Supernovae mode: OFF + + Simgrid dependencies: -ldl -llua5.1 + Gras dependencies: pthread + Ruby dependencies: + Smpi dependencies: + + USER_PREFIX: /usr/local + INSTALL_PREFIX: /usr/local + +-- Configuring done +-- Generating done +-- Build files have been written to: /home/navarrop/Bureau/simgrid-trunk +\endverbatim +Here all options are checked and printed. If it doesn't match with your configuration +it is probably due to a wrong configuration. + +\subsection faq_cmakehowto How to modified sources files for developers + +\subsubsection faq_cmakehowto1 Add an executable or examples. + +If you want make an executable you have to create a CMakeList.txt to the src directory. +You must specified where to create the executable, source list, dependencies and the name of the binary. + +\verbatim +cmake_minimum_required(VERSION 2.6) + +set(EXECUTABLE_OUTPUT_PATH "./") +set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") + +add_executable(get_sender get_sender.c) #add_executable( ) + +### Add definitions for compile +target_link_libraries(get_sender simgrid m pthread -fprofile-arcs) #target_link_libraries( ) +\endverbatim + +Then you have to modified /buildtools/Cmake/src/CMakeMakeExeLib.txt and add +this line : +\verbatim +add_subdirectory(${PROJECT_DIRECTORY}/) +\endverbatim + +\subsubsection faq_cmakehowto2 Delete/add sources to lib. + +If you want modified, add or delete source files from a library you have to edit /buildtools/Cmake/src/CMakeDefinePackages.txt + +\verbatim +set(JMSG_JAVA_SRC + ${PROJECT_DIRECTORY}/src/java/simgrid/msg/MsgException.java + ${PROJECT_DIRECTORY}/src/java/simgrid/msg/JniException.java + ${PROJECT_DIRECTORY}/src/java/simgrid/msg/NativeException.java + ${PROJECT_DIRECTORY}/src/java/simgrid/msg/HostNotFoundException.java + ${PROJECT_DIRECTORY}/src/java/simgrid/msg/ProcessNotFoundException.java + ${PROJECT_DIRECTORY}/src/java/simgrid/msg/Msg.java + ${PROJECT_DIRECTORY}/src/java/simgrid/msg/Process.java + ${PROJECT_DIRECTORY}/src/java/simgrid/msg/Host.java + ${PROJECT_DIRECTORY}/src/java/simgrid/msg/Task.java + ${PROJECT_DIRECTORY}/src/java/simgrid/msg/MsgNative.java + ${PROJECT_DIRECTORY}/src/java/simgrid/msg/ApplicationHandler.java + ${PROJECT_DIRECTORY}/src/java/simgrid/msg/Sem.java +) +\endverbatim + +\subsubsection faq_cmakehowto3 Add test + +If you want modified, add or delete tests you have to edit /buildtools/Cmake/src/CMakeTest.txt +with this function : ADD_TEST( ) + +\verbatim +add_test(test-simdag-1 ${PROJECT_DIRECTORY}/testsuite/simdag/sd_test --cfg=path:${PROJECT_DIRECTORY}/testsuite/simdag small_platform_variable.xml) +\endverbatim + +\subsection faq_cmakeExplain Explaination of sources files for cmake + +\li CMakeLists.txt + +Those files are the "main parts". One located at the project directory call all the cmake sources files. The others +are little projects called by the first for make examples. + +\li CMakeCompleteInFiles.txt + +Complete all .in files and define Variables for h files + +\li CMakeDocs.txt + +This file make the html documentation. + +\li CMakeMakeExeLib.txt + +Here are callled all "CMakeLists.txt" for make executables and libraries. + +\li CMakePrintArgs.txt + +This file is called at the end of the build for summarize environment variables. + +\li CMakeDefinePackages.txt + +Here is defined sources packages for compiling libs. + +\li CMakeFlags.txt + +Defined flags which are used for compiling sources. + +\li CMakeSupernovae.txt + +Here are made files for the supernovae mode. + +\li CMakeDistrib.txt + +Here is defined packages for install simgrid and make a distribution. + +\li CMakeFLEXml.txt + +Part for generated sources from flex and flexml. + +\li CMakeOption.txt + +Here are defined options and initialized values. + +\li CMakeTest.txt + +All tests are listed. + +\li CTestConfig.cmake + +Properties which link tests with dashboard. + +\subsection faq_cmakeList List of files added for cmake + +Here is a list of files involved into cmake build (relative to project directory path) : +\verbatim + +Cmake sources: + ./buildtools/Cmake/src/CMakeCompleteInFiles.txt + ./buildtools/Cmake/src/CMakeDocs.txt + ./buildtools/Cmake/src/CMakeMakeExeLib.txt + ./buildtools/Cmake/src/CMakePrintArgs.txt + ./buildtools/Cmake/src/CMakeDefinePackages.txt + ./buildtools/Cmake/src/CMakeFlags.txt + ./buildtools/Cmake/src/CMakeSupernovae.txt + ./buildtools/Cmake/src/CMakeDistrib.txt + ./buildtools/Cmake/src/CMakeFLEXml.txt + ./buildtools/Cmake/src/CMakeOption.txt + ./buildtools/Cmake/src/CMakeTest.txt + ./buildtools/Cmake/src/CTestConfig.cmake + +Test files for define properties : + ./buildtools/Cmake/prog_test/prog_GRAS_ARCH.c + ./buildtools/Cmake/prog_test/prog_max_size.c + ./buildtools/Cmake/prog_test/prog_sem_init.c + ./buildtools/Cmake/prog_test/prog_stackgrowth.c + ./buildtools/Cmake/prog_test/prog_vsnprintf.c + ./buildtools/Cmake/prog_test/prog_AC_CHECK_MCSC.c + ./buildtools/Cmake/prog_test/prog_GRAS_CHECK_STRUCT_COMPACTION.c + ./buildtools/Cmake/prog_test/prog_mutex_timedlock.c + ./buildtools/Cmake/prog_test/prog_sem_timedwait.c + ./buildtools/Cmake/prog_test/prog_stacksetup.c + ./buildtools/Cmake/prog_test/prog_getline.c + ./buildtools/Cmake/prog_test/prog_gtnets.cpp + ./buildtools/Cmake/prog_test/prog_printf_null.c + ./buildtools/Cmake/prog_test/prog_snprintf.c + ./buildtools/Cmake/prog_test/prog_va_copy.c + +CMakeLists for each binaries or examples: + ./CMakeLists.txt + ./teshsuite/gras/empty_main/CMakeLists.txt + ./teshsuite/gras/small_sleep/CMakeLists.txt + ./teshsuite/gras/datadesc/CMakeLists.txt + ./teshsuite/gras/msg_handle/CMakeLists.txt + ./teshsuite/simdag/CMakeLists.txt + ./teshsuite/simdag/partask/CMakeLists.txt + ./teshsuite/simdag/platforms/CMakeLists.txt + ./teshsuite/simdag/network/CMakeLists.txt + ./teshsuite/simdag/network/mxn/CMakeLists.txt + ./teshsuite/simdag/network/p2p/CMakeLists.txt + ./teshsuite/xbt/CMakeLists.txt + ./teshsuite/msg/CMakeLists.txt + ./tools/gras/CMakeLists.txt + ./tools/tesh/CMakeLists.txt + ./testsuite/simdag/CMakeLists.txt + ./testsuite/xbt/CMakeLists.txt + ./testsuite/surf/CMakeLists.txt + ./examples/gras/properties/CMakeLists.txt + ./examples/gras/ping/CMakeLists.txt + ./examples/gras/pmm/CMakeLists.txt + ./examples/gras/mmrpc/CMakeLists.txt + ./examples/gras/synchro/CMakeLists.txt + ./examples/gras/timer/CMakeLists.txt + ./examples/gras/mutual_exclusion/simple_token/CMakeLists.txt + ./examples/gras/spawn/CMakeLists.txt + ./examples/gras/chrono/CMakeLists.txt + ./examples/gras/rpc/CMakeLists.txt + ./examples/gras/all2all/CMakeLists.txt + ./examples/simdag/properties/CMakeLists.txt + ./examples/simdag/CMakeLists.txt + ./examples/simdag/metaxml/CMakeLists.txt + ./examples/simdag/dax/CMakeLists.txt + ./examples/smpi/CMakeLists.txt + ./examples/amok/bandwidth/CMakeLists.txt + ./examples/amok/saturate/CMakeLists.txt + ./examples/msg/priority/CMakeLists.txt + ./examples/msg/properties/CMakeLists.txt + ./examples/msg/migration/CMakeLists.txt + ./examples/msg/gtnets/CMakeLists.txt + ./examples/msg/parallel_task/CMakeLists.txt + ./examples/msg/trace/CMakeLists.txt + ./examples/msg/suspend/CMakeLists.txt + ./examples/msg/masterslave/CMakeLists.txt + ./examples/msg/actions/CMakeLists.txt + ./examples/msg/sendrecv/CMakeLists.txt +\endverbatim \section faq_howto Feature related questions diff --git a/buildtools/Cmake/simgrid_CMakeList/examples/amok/bandwidth/CMakeLists.txt b/examples/amok/bandwidth/CMakeLists.txt similarity index 100% rename from buildtools/Cmake/simgrid_CMakeList/examples/amok/bandwidth/CMakeLists.txt rename to examples/amok/bandwidth/CMakeLists.txt diff --git a/buildtools/Cmake/simgrid_CMakeList/examples/amok/saturate/CMakeLists.txt b/examples/amok/saturate/CMakeLists.txt similarity index 100% rename from buildtools/Cmake/simgrid_CMakeList/examples/amok/saturate/CMakeLists.txt rename to examples/amok/saturate/CMakeLists.txt diff --git a/buildtools/Cmake/simgrid_CMakeList/examples/gras/all2all/CMakeLists.txt b/examples/gras/all2all/CMakeLists.txt similarity index 100% rename from buildtools/Cmake/simgrid_CMakeList/examples/gras/all2all/CMakeLists.txt rename to examples/gras/all2all/CMakeLists.txt diff --git a/buildtools/Cmake/simgrid_CMakeList/examples/gras/chrono/CMakeLists.txt b/examples/gras/chrono/CMakeLists.txt similarity index 100% rename from buildtools/Cmake/simgrid_CMakeList/examples/gras/chrono/CMakeLists.txt rename to examples/gras/chrono/CMakeLists.txt diff --git a/buildtools/Cmake/simgrid_CMakeList/examples/gras/mmrpc/CMakeLists.txt b/examples/gras/mmrpc/CMakeLists.txt similarity index 100% rename from buildtools/Cmake/simgrid_CMakeList/examples/gras/mmrpc/CMakeLists.txt rename to examples/gras/mmrpc/CMakeLists.txt diff --git a/buildtools/Cmake/simgrid_CMakeList/examples/gras/mutual_exclusion/simple_token/CMakeLists.txt b/examples/gras/mutual_exclusion/simple_token/CMakeLists.txt similarity index 100% rename from buildtools/Cmake/simgrid_CMakeList/examples/gras/mutual_exclusion/simple_token/CMakeLists.txt rename to examples/gras/mutual_exclusion/simple_token/CMakeLists.txt diff --git a/buildtools/Cmake/simgrid_CMakeList/examples/gras/ping/CMakeLists.txt b/examples/gras/ping/CMakeLists.txt similarity index 100% rename from buildtools/Cmake/simgrid_CMakeList/examples/gras/ping/CMakeLists.txt rename to examples/gras/ping/CMakeLists.txt diff --git a/buildtools/Cmake/simgrid_CMakeList/examples/gras/pmm/CMakeLists.txt b/examples/gras/pmm/CMakeLists.txt similarity index 100% rename from buildtools/Cmake/simgrid_CMakeList/examples/gras/pmm/CMakeLists.txt rename to examples/gras/pmm/CMakeLists.txt diff --git a/buildtools/Cmake/simgrid_CMakeList/examples/gras/properties/CMakeLists.txt b/examples/gras/properties/CMakeLists.txt similarity index 100% rename from buildtools/Cmake/simgrid_CMakeList/examples/gras/properties/CMakeLists.txt rename to examples/gras/properties/CMakeLists.txt diff --git a/buildtools/Cmake/simgrid_CMakeList/examples/gras/rpc/CMakeLists.txt b/examples/gras/rpc/CMakeLists.txt similarity index 100% rename from buildtools/Cmake/simgrid_CMakeList/examples/gras/rpc/CMakeLists.txt rename to examples/gras/rpc/CMakeLists.txt diff --git a/buildtools/Cmake/simgrid_CMakeList/examples/gras/spawn/CMakeLists.txt b/examples/gras/spawn/CMakeLists.txt similarity index 100% rename from buildtools/Cmake/simgrid_CMakeList/examples/gras/spawn/CMakeLists.txt rename to examples/gras/spawn/CMakeLists.txt diff --git a/buildtools/Cmake/simgrid_CMakeList/examples/gras/synchro/CMakeLists.txt b/examples/gras/synchro/CMakeLists.txt similarity index 100% rename from buildtools/Cmake/simgrid_CMakeList/examples/gras/synchro/CMakeLists.txt rename to examples/gras/synchro/CMakeLists.txt diff --git a/buildtools/Cmake/simgrid_CMakeList/examples/gras/timer/CMakeLists.txt b/examples/gras/timer/CMakeLists.txt similarity index 100% rename from buildtools/Cmake/simgrid_CMakeList/examples/gras/timer/CMakeLists.txt rename to examples/gras/timer/CMakeLists.txt diff --git a/buildtools/Cmake/simgrid_CMakeList/examples/msg/actions/CMakeLists.txt b/examples/msg/actions/CMakeLists.txt similarity index 100% rename from buildtools/Cmake/simgrid_CMakeList/examples/msg/actions/CMakeLists.txt rename to examples/msg/actions/CMakeLists.txt diff --git a/buildtools/Cmake/simgrid_CMakeList/examples/msg/gtnets/CMakeLists.txt b/examples/msg/gtnets/CMakeLists.txt similarity index 100% rename from buildtools/Cmake/simgrid_CMakeList/examples/msg/gtnets/CMakeLists.txt rename to examples/msg/gtnets/CMakeLists.txt diff --git a/buildtools/Cmake/simgrid_CMakeList/examples/msg/masterslave/CMakeLists.txt b/examples/msg/masterslave/CMakeLists.txt similarity index 100% rename from buildtools/Cmake/simgrid_CMakeList/examples/msg/masterslave/CMakeLists.txt rename to examples/msg/masterslave/CMakeLists.txt diff --git a/buildtools/Cmake/simgrid_CMakeList/examples/msg/migration/CMakeLists.txt b/examples/msg/migration/CMakeLists.txt similarity index 100% rename from buildtools/Cmake/simgrid_CMakeList/examples/msg/migration/CMakeLists.txt rename to examples/msg/migration/CMakeLists.txt diff --git a/buildtools/Cmake/simgrid_CMakeList/examples/msg/parallel_task/CMakeLists.txt b/examples/msg/parallel_task/CMakeLists.txt similarity index 100% rename from buildtools/Cmake/simgrid_CMakeList/examples/msg/parallel_task/CMakeLists.txt rename to examples/msg/parallel_task/CMakeLists.txt diff --git a/buildtools/Cmake/simgrid_CMakeList/examples/msg/priority/CMakeLists.txt b/examples/msg/priority/CMakeLists.txt similarity index 100% rename from buildtools/Cmake/simgrid_CMakeList/examples/msg/priority/CMakeLists.txt rename to examples/msg/priority/CMakeLists.txt diff --git a/buildtools/Cmake/simgrid_CMakeList/examples/msg/properties/CMakeLists.txt b/examples/msg/properties/CMakeLists.txt similarity index 100% rename from buildtools/Cmake/simgrid_CMakeList/examples/msg/properties/CMakeLists.txt rename to examples/msg/properties/CMakeLists.txt diff --git a/buildtools/Cmake/simgrid_CMakeList/examples/msg/sendrecv/CMakeLists.txt b/examples/msg/sendrecv/CMakeLists.txt similarity index 100% rename from buildtools/Cmake/simgrid_CMakeList/examples/msg/sendrecv/CMakeLists.txt rename to examples/msg/sendrecv/CMakeLists.txt diff --git a/buildtools/Cmake/simgrid_CMakeList/examples/msg/suspend/CMakeLists.txt b/examples/msg/suspend/CMakeLists.txt similarity index 100% rename from buildtools/Cmake/simgrid_CMakeList/examples/msg/suspend/CMakeLists.txt rename to examples/msg/suspend/CMakeLists.txt diff --git a/buildtools/Cmake/simgrid_CMakeList/examples/msg/trace/CMakeLists.txt b/examples/msg/trace/CMakeLists.txt similarity index 100% rename from buildtools/Cmake/simgrid_CMakeList/examples/msg/trace/CMakeLists.txt rename to examples/msg/trace/CMakeLists.txt diff --git a/buildtools/Cmake/simgrid_CMakeList/examples/simdag/CMakeLists.txt b/examples/simdag/CMakeLists.txt similarity index 100% rename from buildtools/Cmake/simgrid_CMakeList/examples/simdag/CMakeLists.txt rename to examples/simdag/CMakeLists.txt diff --git a/buildtools/Cmake/simgrid_CMakeList/examples/simdag/dax/CMakeLists.txt b/examples/simdag/dax/CMakeLists.txt similarity index 100% rename from buildtools/Cmake/simgrid_CMakeList/examples/simdag/dax/CMakeLists.txt rename to examples/simdag/dax/CMakeLists.txt diff --git a/buildtools/Cmake/simgrid_CMakeList/examples/simdag/metaxml/CMakeLists.txt b/examples/simdag/metaxml/CMakeLists.txt similarity index 100% rename from buildtools/Cmake/simgrid_CMakeList/examples/simdag/metaxml/CMakeLists.txt rename to examples/simdag/metaxml/CMakeLists.txt diff --git a/buildtools/Cmake/simgrid_CMakeList/examples/simdag/properties/CMakeLists.txt b/examples/simdag/properties/CMakeLists.txt similarity index 100% rename from buildtools/Cmake/simgrid_CMakeList/examples/simdag/properties/CMakeLists.txt rename to examples/simdag/properties/CMakeLists.txt diff --git a/buildtools/Cmake/simgrid_CMakeList/examples/smpi/CMakeLists.txt b/examples/smpi/CMakeLists.txt similarity index 100% rename from buildtools/Cmake/simgrid_CMakeList/examples/smpi/CMakeLists.txt rename to examples/smpi/CMakeLists.txt diff --git a/buildtools/Cmake/simgrid_CMakeList/teshsuite/gras/datadesc/CMakeLists.txt b/teshsuite/gras/datadesc/CMakeLists.txt similarity index 100% rename from buildtools/Cmake/simgrid_CMakeList/teshsuite/gras/datadesc/CMakeLists.txt rename to teshsuite/gras/datadesc/CMakeLists.txt diff --git a/buildtools/Cmake/simgrid_CMakeList/teshsuite/gras/empty_main/CMakeLists.txt b/teshsuite/gras/empty_main/CMakeLists.txt similarity index 100% rename from buildtools/Cmake/simgrid_CMakeList/teshsuite/gras/empty_main/CMakeLists.txt rename to teshsuite/gras/empty_main/CMakeLists.txt diff --git a/buildtools/Cmake/simgrid_CMakeList/teshsuite/gras/msg_handle/CMakeLists.txt b/teshsuite/gras/msg_handle/CMakeLists.txt similarity index 100% rename from buildtools/Cmake/simgrid_CMakeList/teshsuite/gras/msg_handle/CMakeLists.txt rename to teshsuite/gras/msg_handle/CMakeLists.txt diff --git a/buildtools/Cmake/simgrid_CMakeList/teshsuite/gras/small_sleep/CMakeLists.txt b/teshsuite/gras/small_sleep/CMakeLists.txt similarity index 100% rename from buildtools/Cmake/simgrid_CMakeList/teshsuite/gras/small_sleep/CMakeLists.txt rename to teshsuite/gras/small_sleep/CMakeLists.txt diff --git a/buildtools/Cmake/simgrid_CMakeList/teshsuite/msg/CMakeLists.txt b/teshsuite/msg/CMakeLists.txt similarity index 100% rename from buildtools/Cmake/simgrid_CMakeList/teshsuite/msg/CMakeLists.txt rename to teshsuite/msg/CMakeLists.txt diff --git a/buildtools/Cmake/simgrid_CMakeList/teshsuite/simdag/CMakeLists.txt b/teshsuite/simdag/CMakeLists.txt similarity index 100% rename from buildtools/Cmake/simgrid_CMakeList/teshsuite/simdag/CMakeLists.txt rename to teshsuite/simdag/CMakeLists.txt diff --git a/buildtools/Cmake/simgrid_CMakeList/teshsuite/simdag/network/CMakeLists.txt b/teshsuite/simdag/network/CMakeLists.txt similarity index 100% rename from buildtools/Cmake/simgrid_CMakeList/teshsuite/simdag/network/CMakeLists.txt rename to teshsuite/simdag/network/CMakeLists.txt diff --git a/buildtools/Cmake/simgrid_CMakeList/teshsuite/simdag/network/mxn/CMakeLists.txt b/teshsuite/simdag/network/mxn/CMakeLists.txt similarity index 100% rename from buildtools/Cmake/simgrid_CMakeList/teshsuite/simdag/network/mxn/CMakeLists.txt rename to teshsuite/simdag/network/mxn/CMakeLists.txt diff --git a/buildtools/Cmake/simgrid_CMakeList/teshsuite/simdag/network/p2p/CMakeLists.txt b/teshsuite/simdag/network/p2p/CMakeLists.txt similarity index 100% rename from buildtools/Cmake/simgrid_CMakeList/teshsuite/simdag/network/p2p/CMakeLists.txt rename to teshsuite/simdag/network/p2p/CMakeLists.txt diff --git a/buildtools/Cmake/simgrid_CMakeList/teshsuite/simdag/partask/CMakeLists.txt b/teshsuite/simdag/partask/CMakeLists.txt similarity index 100% rename from buildtools/Cmake/simgrid_CMakeList/teshsuite/simdag/partask/CMakeLists.txt rename to teshsuite/simdag/partask/CMakeLists.txt diff --git a/buildtools/Cmake/simgrid_CMakeList/teshsuite/simdag/platforms/CMakeLists.txt b/teshsuite/simdag/platforms/CMakeLists.txt similarity index 100% rename from buildtools/Cmake/simgrid_CMakeList/teshsuite/simdag/platforms/CMakeLists.txt rename to teshsuite/simdag/platforms/CMakeLists.txt diff --git a/buildtools/Cmake/simgrid_CMakeList/teshsuite/xbt/CMakeLists.txt b/teshsuite/xbt/CMakeLists.txt similarity index 100% rename from buildtools/Cmake/simgrid_CMakeList/teshsuite/xbt/CMakeLists.txt rename to teshsuite/xbt/CMakeLists.txt diff --git a/buildtools/Cmake/simgrid_CMakeList/testsuite/simdag/CMakeLists.txt b/testsuite/simdag/CMakeLists.txt similarity index 100% rename from buildtools/Cmake/simgrid_CMakeList/testsuite/simdag/CMakeLists.txt rename to testsuite/simdag/CMakeLists.txt diff --git a/buildtools/Cmake/simgrid_CMakeList/testsuite/surf/CMakeLists.txt b/testsuite/surf/CMakeLists.txt similarity index 100% rename from buildtools/Cmake/simgrid_CMakeList/testsuite/surf/CMakeLists.txt rename to testsuite/surf/CMakeLists.txt diff --git a/buildtools/Cmake/simgrid_CMakeList/testsuite/xbt/CMakeLists.txt b/testsuite/xbt/CMakeLists.txt similarity index 100% rename from buildtools/Cmake/simgrid_CMakeList/testsuite/xbt/CMakeLists.txt rename to testsuite/xbt/CMakeLists.txt diff --git a/buildtools/Cmake/simgrid_CMakeList/tools/gras/CMakeLists.txt b/tools/gras/CMakeLists.txt similarity index 100% rename from buildtools/Cmake/simgrid_CMakeList/tools/gras/CMakeLists.txt rename to tools/gras/CMakeLists.txt diff --git a/buildtools/Cmake/simgrid_CMakeList/tools/tesh/CMakeLists.txt b/tools/tesh/CMakeLists.txt similarity index 100% rename from buildtools/Cmake/simgrid_CMakeList/tools/tesh/CMakeLists.txt rename to tools/tesh/CMakeLists.txt