Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Reindent Cmake files.
authorArnaud Giersch <arnaud.giersch@iut-bm.univ-fcomte.fr>
Tue, 26 Jun 2012 15:05:16 +0000 (17:05 +0200)
committerArnaud Giersch <arnaud.giersch@iut-bm.univ-fcomte.fr>
Tue, 26 Jun 2012 17:05:44 +0000 (19:05 +0200)
102 files changed:
CMakeLists.txt
buildtools/Cmake/AddTests.cmake
buildtools/Cmake/CTestConfig.cmake
buildtools/Cmake/CompleteInFiles.cmake
buildtools/Cmake/DefinePackages.cmake
buildtools/Cmake/Distrib.cmake
buildtools/Cmake/Flags.cmake
buildtools/Cmake/GenerateDoc.cmake
buildtools/Cmake/GenerateDocWin.cmake
buildtools/Cmake/GenerateRefGuide.cmake
buildtools/Cmake/GenerateUserGuide.cmake
buildtools/Cmake/MaintainerMode.cmake
buildtools/Cmake/MakeExe.cmake
buildtools/Cmake/MakeLib.cmake
buildtools/Cmake/MakeLibWin.cmake
buildtools/Cmake/Modules/FindF2c.cmake
buildtools/Cmake/Modules/FindGTnets.cmake
buildtools/Cmake/Modules/FindGraphviz.cmake
buildtools/Cmake/Modules/FindLua51Simgrid.cmake
buildtools/Cmake/Modules/FindNS3.cmake
buildtools/Cmake/Modules/FindPCRE.cmake
buildtools/Cmake/Modules/FindPcreWin.cmake
buildtools/Cmake/Modules/FindRngStream.cmake
buildtools/Cmake/Modules/FindRubySimgrid.cmake
buildtools/Cmake/Modules/FindSimGrid.cmake
buildtools/Cmake/Modules/FindValgrind.cmake
buildtools/Cmake/Option.cmake
buildtools/Cmake/Pipol.cmake
buildtools/Cmake/Supernovae.cmake
buildtools/Cmake/UnitTesting.cmake
buildtools/Cmake/memcheck_tests.cmake
buildtools/pipol/CtestPipol.cmake
buildtools/pipol/cmake.pl
doc/HelloWorld/CMakeLists.txt
doc/HelloWorld/FindPcreWin.cmake
examples/amok/bandwidth/CMakeLists.txt
examples/amok/saturate/CMakeLists.txt
examples/gras/all2all/CMakeLists.txt
examples/gras/chrono/CMakeLists.txt
examples/gras/console/CMakeLists.txt
examples/gras/mmrpc/CMakeLists.txt
examples/gras/mutual_exclusion/simple_token/CMakeLists.txt
examples/gras/ping/CMakeLists.txt
examples/gras/pmm/CMakeLists.txt
examples/gras/properties/CMakeLists.txt
examples/gras/rpc/CMakeLists.txt
examples/gras/spawn/CMakeLists.txt
examples/gras/synchro/CMakeLists.txt
examples/gras/timer/CMakeLists.txt
examples/lua/CMakeLists.txt
examples/msg/CMakeLists.txt
examples/msg/actions/CMakeLists.txt
examples/msg/chord/CMakeLists.txt
examples/msg/cloud/CMakeLists.txt
examples/msg/gpu/CMakeLists.txt
examples/msg/gtnets/CMakeLists.txt
examples/msg/icomms/CMakeLists.txt
examples/msg/io/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/pmm/CMakeLists.txt
examples/msg/priority/CMakeLists.txt
examples/msg/properties/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/simdag/CMakeLists.txt
examples/simdag/dax/CMakeLists.txt
examples/simdag/dot/CMakeLists.txt
examples/simdag/goal/CMakeLists.txt
examples/simdag/metaxml/CMakeLists.txt
examples/simdag/properties/CMakeLists.txt
examples/simdag/scheduling/CMakeLists.txt
examples/smpi/CMakeLists.txt
examples/xbt/CMakeLists.txt
teshsuite/CMakeLists.txt
teshsuite/gras/CMakeLists.txt
teshsuite/gras/datadesc/CMakeLists.txt
teshsuite/gras/empty_main/CMakeLists.txt
teshsuite/gras/msg_handle/CMakeLists.txt
teshsuite/gras/numerous_rpc/CMakeLists.txt
teshsuite/gras/small_sleep/CMakeLists.txt
teshsuite/msg/CMakeLists.txt
teshsuite/msg/trace/CMakeLists.txt
teshsuite/simdag/CMakeLists.txt
teshsuite/simdag/network/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/xbt/CMakeLists.txt
testsuite/surf/CMakeLists.txt
testsuite/xbt/CMakeLists.txt
tools/CMakeLists.txt
tools/graphicator/CMakeLists.txt
tools/gras/CMakeLists.txt
tools/tesh/CMakeLists.txt

index d5afc0a..1be51f1 100644 (file)
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 2.6)
 ### Need to set rc ccompiler before enable language
 if(WIN32)
-    SET(CMAKE_RC_COMPILER "windres")
+  SET(CMAKE_RC_COMPILER "windres")
 endif(WIN32)
 project(SimGrid CXX C)
 
@@ -23,9 +23,9 @@ set(SIMGRID_VERSION_MINOR "8")
 set(SIMGRID_VERSION_PATCH "0")
 
 if(${SIMGRID_VERSION_PATCH} EQUAL "0")
-       set(release_version "${SIMGRID_VERSION_MAJOR}.${SIMGRID_VERSION_MINOR}")
+  set(release_version "${SIMGRID_VERSION_MAJOR}.${SIMGRID_VERSION_MINOR}")
 else(${SIMGRID_VERSION_PATCH} EQUAL "0")
-       set(release_version "${SIMGRID_VERSION_MAJOR}.${SIMGRID_VERSION_MINOR}.${SIMGRID_VERSION_PATCH}")
+  set(release_version "${SIMGRID_VERSION_MAJOR}.${SIMGRID_VERSION_MINOR}.${SIMGRID_VERSION_PATCH}")
 endif(${SIMGRID_VERSION_PATCH} EQUAL "0")
 set(libsimgrid_version "${release_version}")
 set(libgras_version "${release_version}")
@@ -35,90 +35,90 @@ set(APPLE_NEED_GCC_VERSION "4.6")
 
 ### SET THE LIBRARY EXTENSION AND GCC VERSION
 if(APPLE) #MAC
-       set(LIB_EXE "dylib")
+  set(LIB_EXE "dylib")
 else(APPLE)
-    if(WIN32) #WINDOWS
-        set(LIB_EXE "a")
-        set(BIN_EXE ".exe")
-    else(WIN32) #UNIX
-           set(LIB_EXE "so")
-    endif(WIN32)
+  if(WIN32) #WINDOWS
+    set(LIB_EXE "a")
+    set(BIN_EXE ".exe")
+  else(WIN32) #UNIX
+    set(LIB_EXE "so")
+  endif(WIN32)
 endif(APPLE)
 
 string(REGEX MATCH "gcc" GCC "${CMAKE_C_COMPILER}")
 if(GCC)
-       exec_program("${CMAKE_C_COMPILER} --version" OUTPUT_VARIABLE "COMPILER_C_VERSION")
-       exec_program("${CMAKE_CXX_COMPILER} --version" OUTPUT_VARIABLE "COMPILER_CXX_VERSION")
-       string(REGEX MATCH "[0-9].[0-9].[0-9]" COMPILER_C_VERSION "${COMPILER_C_VERSION}")
-       string(REGEX MATCH "[0-9].[0-9].[0-9]" COMPILER_CXX_VERSION "${COMPILER_CXX_VERSION}")
-       
-       string(REGEX MATCH "^[0-9].[0-9]" COMPILER_C_VERSION_MAJOR_MINOR "${COMPILER_C_VERSION}")
-       string(REPLACE "${COMPILER_C_VERSION_MAJOR_MINOR}." "" COMPILER_C_VERSION_PATCH "${COMPILER_C_VERSION}")
-       
-       if(${GCC_NEED_VERSION} GREATER  COMPILER_C_VERSION_MAJOR_MINOR)
-           message(FATAL_ERROR "Gcc must be to version ${GCC_NEED_VERSION} current version ${COMPILER_C_VERSION_MAJOR_MINOR}")
-       endif(${GCC_NEED_VERSION} GREATER  COMPILER_C_VERSION_MAJOR_MINOR)
+  exec_program("${CMAKE_C_COMPILER} --version" OUTPUT_VARIABLE "COMPILER_C_VERSION")
+  exec_program("${CMAKE_CXX_COMPILER} --version" OUTPUT_VARIABLE "COMPILER_CXX_VERSION")
+  string(REGEX MATCH "[0-9].[0-9].[0-9]" COMPILER_C_VERSION "${COMPILER_C_VERSION}")
+  string(REGEX MATCH "[0-9].[0-9].[0-9]" COMPILER_CXX_VERSION "${COMPILER_CXX_VERSION}")
+
+  string(REGEX MATCH "^[0-9].[0-9]" COMPILER_C_VERSION_MAJOR_MINOR "${COMPILER_C_VERSION}")
+  string(REPLACE "${COMPILER_C_VERSION_MAJOR_MINOR}." "" COMPILER_C_VERSION_PATCH "${COMPILER_C_VERSION}")
+
+  if(${GCC_NEED_VERSION} GREATER  COMPILER_C_VERSION_MAJOR_MINOR)
+    message(FATAL_ERROR "Gcc must be to version ${GCC_NEED_VERSION} current version ${COMPILER_C_VERSION_MAJOR_MINOR}")
+  endif(${GCC_NEED_VERSION} GREATER  COMPILER_C_VERSION_MAJOR_MINOR)
 endif(GCC)
 
 string(REGEX MATCH "cl.exe" VBC "${CMAKE_C_COMPILER}")
 if(VBC)
-    message(FATAL_ERROR "VB is not yet supported by Simgrid.")
+  message(FATAL_ERROR "VB is not yet supported by Simgrid.")
 endif(VBC)
 
 ### Find programs and paths
 FIND_PROGRAM(GCOV_PATH gcov)
 include(FindPerl)
 if(NOT PERL_EXECUTABLE)
-       message(FATAL_ERROR "-- SimGrid cannot be compiled without Perl installed -- sorry. Bailling out.")
+  message(FATAL_ERROR "-- SimGrid cannot be compiled without Perl installed -- sorry. Bailling out.")
 endif(NOT PERL_EXECUTABLE)
 
 if(CMAKE_CACHE_MAJOR_VERSION EQUAL "2" AND CMAKE_CACHE_MINOR_VERSION GREATER "7") #need cmake version 2.8
-       get_filename_component(TRUE_CMAKE_HOME_DIRECTORY "${CMAKE_HOME_DIRECTORY}" REALPATH)
-       get_filename_component(TRUE_CMAKE_BINARY_DIR "${CMAKE_BINARY_DIR}" REALPATH)
-       if(${TRUE_CMAKE_HOME_DIRECTORY} STREQUAL ${CMAKE_HOME_DIRECTORY})
-       else(${TRUE_CMAKE_HOME_DIRECTORY} STREQUAL ${CMAKE_HOME_DIRECTORY})
-               message(STATUS "Change link path '${CMAKE_HOME_DIRECTORY}' to true path '${TRUE_CMAKE_HOME_DIRECTORY}'")
-               set(CMAKE_HOME_DIRECTORY "${TRUE_CMAKE_HOME_DIRECTORY}" CACHE TYPE INTERNAL FORCE)
-               set(CMAKE_SOURCE_DIR "${TRUE_CMAKE_HOME_DIRECTORY}" CACHE TYPE INTERNAL FORCE)
-       endif(${TRUE_CMAKE_HOME_DIRECTORY} STREQUAL ${CMAKE_HOME_DIRECTORY})
-       
-       if(${TRUE_CMAKE_BINARY_DIR} STREQUAL ${CMAKE_BINARY_DIR})
-       else(${TRUE_CMAKE_BINARY_DIR} STREQUAL ${CMAKE_BINARY_DIR})
-               message(STATUS "Change link path '${CMAKE_BINARY_DIR}' to true path '${TRUE_CMAKE_BINARY_DIR}'")
-               set(CMAKE_BINARY_DIR "${TRUE_CMAKE_BINARY_DIR}" CACHE TYPE INTERNAL FORCE)
-       endif(${TRUE_CMAKE_BINARY_DIR} STREQUAL ${CMAKE_BINARY_DIR})    
+  get_filename_component(TRUE_CMAKE_HOME_DIRECTORY "${CMAKE_HOME_DIRECTORY}" REALPATH)
+  get_filename_component(TRUE_CMAKE_BINARY_DIR "${CMAKE_BINARY_DIR}" REALPATH)
+  if(${TRUE_CMAKE_HOME_DIRECTORY} STREQUAL ${CMAKE_HOME_DIRECTORY})
+  else(${TRUE_CMAKE_HOME_DIRECTORY} STREQUAL ${CMAKE_HOME_DIRECTORY})
+    message(STATUS "Change link path '${CMAKE_HOME_DIRECTORY}' to true path '${TRUE_CMAKE_HOME_DIRECTORY}'")
+    set(CMAKE_HOME_DIRECTORY "${TRUE_CMAKE_HOME_DIRECTORY}" CACHE TYPE INTERNAL FORCE)
+    set(CMAKE_SOURCE_DIR "${TRUE_CMAKE_HOME_DIRECTORY}" CACHE TYPE INTERNAL FORCE)
+  endif(${TRUE_CMAKE_HOME_DIRECTORY} STREQUAL ${CMAKE_HOME_DIRECTORY})
+
+  if(${TRUE_CMAKE_BINARY_DIR} STREQUAL ${CMAKE_BINARY_DIR})
+  else(${TRUE_CMAKE_BINARY_DIR} STREQUAL ${CMAKE_BINARY_DIR})
+    message(STATUS "Change link path '${CMAKE_BINARY_DIR}' to true path '${TRUE_CMAKE_BINARY_DIR}'")
+    set(CMAKE_BINARY_DIR "${TRUE_CMAKE_BINARY_DIR}" CACHE TYPE INTERNAL FORCE)
+  endif(${TRUE_CMAKE_BINARY_DIR} STREQUAL ${CMAKE_BINARY_DIR})
 endif(CMAKE_CACHE_MAJOR_VERSION EQUAL "2" AND CMAKE_CACHE_MINOR_VERSION GREATER "7")
 
 ### Set some variables for Cmake
 SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib)
 
 if("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_HOME_DIRECTORY}")
-       set(INCLUDES
-       ${CMAKE_HOME_DIRECTORY}
-       ${CMAKE_HOME_DIRECTORY}/include
-       ${CMAKE_HOME_DIRECTORY}/src
-       ${CMAKE_HOME_DIRECTORY}/src/include
-       )
+  set(INCLUDES
+    ${CMAKE_HOME_DIRECTORY}
+    ${CMAKE_HOME_DIRECTORY}/include
+    ${CMAKE_HOME_DIRECTORY}/src
+    ${CMAKE_HOME_DIRECTORY}/src/include
+    )
 else("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_HOME_DIRECTORY}")
-       set(INCLUDES
-       ${CMAKE_HOME_DIRECTORY}
-       ${CMAKE_HOME_DIRECTORY}/include
-       ${CMAKE_HOME_DIRECTORY}/src
-       ${CMAKE_HOME_DIRECTORY}/src/include
-       ${CMAKE_BINARY_DIR}
-       ${CMAKE_BINARY_DIR}/include
-       ${CMAKE_BINARY_DIR}/src
-       )
+  set(INCLUDES
+    ${CMAKE_HOME_DIRECTORY}
+    ${CMAKE_HOME_DIRECTORY}/include
+    ${CMAKE_HOME_DIRECTORY}/src
+    ${CMAKE_HOME_DIRECTORY}/src/include
+    ${CMAKE_BINARY_DIR}
+    ${CMAKE_BINARY_DIR}/include
+    ${CMAKE_BINARY_DIR}/src
+    )
 endif("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_HOME_DIRECTORY}")
 
 set(INCLUDES ${INCLUDES} ${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/include ${CMAKE_HOME_DIRECTORY}/src/include ${CMAKE_HOME_DIRECTORY}/src ${CMAKE_BINARY_DIR}/src)
 if(WIN32)
-    set(INCLUDES ${INCLUDES} ${CMAKE_HOME_DIRECTORY}/include/xbt ${CMAKE_HOME_DIRECTORY}/src/xbt) #for win32_ucontext.[ch]
+  set(INCLUDES ${INCLUDES} ${CMAKE_HOME_DIRECTORY}/include/xbt ${CMAKE_HOME_DIRECTORY}/src/xbt) #for win32_ucontext.[ch]
 endif(WIN32)
 set(CMAKE_SOURCE_DIR ${PROJECT_SOURCE_DIRECTORY})
 
 if(NOT CMAKE_CROSSCOMPILING AND EXISTS /usr/include/)
-       set(INCLUDES ${INCLUDES} /usr/include/)
+  set(INCLUDES ${INCLUDES} /usr/include/)
 endif(NOT CMAKE_CROSSCOMPILING AND EXISTS /usr/include/)
 
 ### Check 32bits or 64bits
@@ -132,59 +132,59 @@ ENDIF(SIZEOF_VOIDSTAR EQUAL 4)
 
 if(WIN32)
 
-    #Need env INCLUDE 
-    set(CMAKE_INCLUDE_WIN "${CMAKE_C_COMPILER}")
-    set(CMAKE_LIB_WIN "${CMAKE_C_COMPILER}")
-    string(REGEX REPLACE "/bin/gcc.*" "/include"  CMAKE_INCLUDE_WIN "${CMAKE_INCLUDE_WIN}")
-    string(REGEX REPLACE "/bin/gcc.*" "/lib"  CMAKE_LIB_WIN "${CMAKE_LIB_WIN}")
-    set(INCLUDES ${INCLUDES} ${CMAKE_INCLUDE_WIN})
-        
-    if(CMAKE_COMPILER_IS_GNUCC)
-        set(__GNUC__ 1)
-        exec_program("${CMAKE_C_COMPILER} --version" OUTPUT_VARIABLE "COMPILER_C_VERSION")
-        string(REGEX MATCH "[0-9].[0-9].[0-9]" COMPILER_C_VERSION "${COMPILER_C_VERSION}")
-        string(REGEX MATCH "^[0-9]" COMPILER_C_MAJOR_VERSION "${COMPILER_C_VERSION}")
-        string(REGEX MATCH "^[0-9].[0-9]" COMPILER_C_MINOR_VERSION "${COMPILER_C_VERSION}")
-        string(REGEX REPLACE "^${COMPILER_C_MAJOR_VERSION}." "" COMPILER_C_MINOR_VERSION "${COMPILER_C_MINOR_VERSION}")
-        if(COMPILER_C_MAJOR_VERSION)
-           # set(__GNUC__ ${COMPILER_C_MAJOR_VERSION})
-        endif(COMPILER_C_MAJOR_VERSION)
-        if(COMPILER_C_MINOR_VERSION)
-           # set(__GNUC_MINOR__ ${COMPILER_C_MINOR_VERSION})
-        endif(COMPILER_C_MINOR_VERSION)
-        set(MSVC 0)
-           set(BORLAND 0)
-    else(CMAKE_COMPILER_IS_GNUCC)
-        message(FATAL_ERROR "Please use MinGW to compile SimGrid!")
-    endif(CMAKE_COMPILER_IS_GNUCC)
-    
-    if(ARCH_32_BITS)   ### Arch 32bits
-        set(_WIN32 1)
-    else(ARCH_32_BITS) ### Arch 64bits
-        set(_WIN64 1)
-    endif(ARCH_32_BITS)
-
-    set(NSIS_WIN_VERSION $ENV{PROCESSOR_ARCHITEW6432})
-    if(NSIS_WIN_VERSION MATCHES "")
-      set(NSIS_WIN_VERSION $ENV{PROCESSOR_ARCHITECTURE})
-    endif(NSIS_WIN_VERSION MATCHES "")
-    string(TOLOWER ${NSIS_WIN_VERSION} NSIS_WIN_VERSION)
-    
-    set(_XBT_WIN32 1)
-    
-    message(STATUS "C_COMPILER                 ${CMAKE_C_COMPILER} ${COMPILER_C_VERSION}")
-    message(STATUS "CXX_COMPILER                       ${CMAKE_CXX_COMPILER} ${COMPILER_CXX_VERSION}")
-    message(STATUS "CMAKE_RC_COMPILER          ${CMAKE_RC_COMPILER}")     
-    message(STATUS "INCLUDE                    ${CMAKE_INCLUDE_WIN}")
-    message(STATUS "LIB                                ${CMAKE_LIB_WIN}")
-    message(STATUS "MAKE_PROGRAM                       ${CMAKE_MAKE_PROGRAM}")
-    message(STATUS "CMAKE_BUILD_TOOL           ${CMAKE_BUILD_TOOL}")
-    message(STATUS "LINKER                     ${CMAKE_LINKER}")
-    message(STATUS "CMAKE_GENERATOR            ${CMAKE_GENERATOR}")
-    message(STATUS "BORLAND                    ${BORLAND}")
-    message(STATUS "VISUALC                    ${MSVC}")
-    message(STATUS "GNUC                               ${CMAKE_COMPILER_IS_GNUCC}")
-   
+  #Need env INCLUDE
+  set(CMAKE_INCLUDE_WIN "${CMAKE_C_COMPILER}")
+  set(CMAKE_LIB_WIN "${CMAKE_C_COMPILER}")
+  string(REGEX REPLACE "/bin/gcc.*" "/include"  CMAKE_INCLUDE_WIN "${CMAKE_INCLUDE_WIN}")
+  string(REGEX REPLACE "/bin/gcc.*" "/lib"  CMAKE_LIB_WIN "${CMAKE_LIB_WIN}")
+  set(INCLUDES ${INCLUDES} ${CMAKE_INCLUDE_WIN})
+
+  if(CMAKE_COMPILER_IS_GNUCC)
+    set(__GNUC__ 1)
+    exec_program("${CMAKE_C_COMPILER} --version" OUTPUT_VARIABLE "COMPILER_C_VERSION")
+    string(REGEX MATCH "[0-9].[0-9].[0-9]" COMPILER_C_VERSION "${COMPILER_C_VERSION}")
+    string(REGEX MATCH "^[0-9]" COMPILER_C_MAJOR_VERSION "${COMPILER_C_VERSION}")
+    string(REGEX MATCH "^[0-9].[0-9]" COMPILER_C_MINOR_VERSION "${COMPILER_C_VERSION}")
+    string(REGEX REPLACE "^${COMPILER_C_MAJOR_VERSION}." "" COMPILER_C_MINOR_VERSION "${COMPILER_C_MINOR_VERSION}")
+    if(COMPILER_C_MAJOR_VERSION)
+      # set(__GNUC__ ${COMPILER_C_MAJOR_VERSION})
+    endif(COMPILER_C_MAJOR_VERSION)
+    if(COMPILER_C_MINOR_VERSION)
+      # set(__GNUC_MINOR__ ${COMPILER_C_MINOR_VERSION})
+    endif(COMPILER_C_MINOR_VERSION)
+    set(MSVC 0)
+    set(BORLAND 0)
+  else(CMAKE_COMPILER_IS_GNUCC)
+    message(FATAL_ERROR "Please use MinGW to compile SimGrid!")
+  endif(CMAKE_COMPILER_IS_GNUCC)
+
+  if(ARCH_32_BITS)     ### Arch 32bits
+    set(_WIN32 1)
+  else(ARCH_32_BITS)   ### Arch 64bits
+    set(_WIN64 1)
+  endif(ARCH_32_BITS)
+
+  set(NSIS_WIN_VERSION $ENV{PROCESSOR_ARCHITEW6432})
+  if(NSIS_WIN_VERSION MATCHES "")
+    set(NSIS_WIN_VERSION $ENV{PROCESSOR_ARCHITECTURE})
+  endif(NSIS_WIN_VERSION MATCHES "")
+  string(TOLOWER ${NSIS_WIN_VERSION} NSIS_WIN_VERSION)
+
+  set(_XBT_WIN32 1)
+
+  message(STATUS "C_COMPILER                   ${CMAKE_C_COMPILER} ${COMPILER_C_VERSION}")
+  message(STATUS "CXX_COMPILER                 ${CMAKE_CXX_COMPILER} ${COMPILER_CXX_VERSION}")
+  message(STATUS "CMAKE_RC_COMPILER            ${CMAKE_RC_COMPILER}")
+  message(STATUS "INCLUDE                      ${CMAKE_INCLUDE_WIN}")
+  message(STATUS "LIB                          ${CMAKE_LIB_WIN}")
+  message(STATUS "MAKE_PROGRAM                 ${CMAKE_MAKE_PROGRAM}")
+  message(STATUS "CMAKE_BUILD_TOOL             ${CMAKE_BUILD_TOOL}")
+  message(STATUS "LINKER                       ${CMAKE_LINKER}")
+  message(STATUS "CMAKE_GENERATOR              ${CMAKE_GENERATOR}")
+  message(STATUS "BORLAND                      ${BORLAND}")
+  message(STATUS "VISUALC                      ${MSVC}")
+  message(STATUS "GNUC                         ${CMAKE_COMPILER_IS_GNUCC}")
+
 endif(WIN32)
 
 include_directories(${INCLUDES})
@@ -199,13 +199,13 @@ include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Option.cmake)
 ### Make the *.h files with *.h.in files
 include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/CompleteInFiles.cmake)
 
-### Define source packages for Libs 
+### Define source packages for Libs
 include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/DefinePackages.cmake)
 
 ### Build some Maintainer files
 include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/MaintainerMode.cmake)
 if(NOT WIN32)
-include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/UnitTesting.cmake)
+  include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/UnitTesting.cmake)
 endif(NOT WIN32)
 
 ### Setup gcc flags
@@ -213,9 +213,9 @@ include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Flags.cmake)
 
 ### Make Libs
 if(NOT WIN32)
-include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/MakeLib.cmake)
+  include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/MakeLib.cmake)
 else(NOT WIN32)
-include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/MakeLibWin.cmake)
+  include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/MakeLibWin.cmake)
 endif(NOT WIN32)
 
 ### Make Exes
@@ -233,9 +233,9 @@ include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Pipol.cmake)
 
 ### Build the doc
 if(NOT WIN32)
-include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/GenerateDoc.cmake)
+  include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/GenerateDoc.cmake)
 else(NOT WIN32)
-include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/GenerateDocWin.cmake)  
+  include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/GenerateDocWin.cmake)
 endif(NOT WIN32)
 
 ### Print ARGS
index 07f31c9..6e17a85 100644 (file)
@@ -1,15 +1,15 @@
 
 if(enable_memcheck)
-include(FindValgrind)
+  include(FindValgrind)
 endif(enable_memcheck)
 
 if(enable_smpi AND NOT WIN32)
-       exec_program("chmod a=rwx ${CMAKE_BINARY_DIR}/bin/smpicc" OUTPUT_VARIABLE "OKITOKI")
-       exec_program("chmod a=rwx ${CMAKE_BINARY_DIR}/bin/smpif2c" OUTPUT_VARIABLE "OKITOKI")
-       exec_program("chmod a=rwx ${CMAKE_BINARY_DIR}/bin/smpiff" OUTPUT_VARIABLE "OKITOKI")
-       exec_program("chmod a=rwx ${CMAKE_BINARY_DIR}/bin/smpirun" OUTPUT_VARIABLE "OKITOKI")
+  exec_program("chmod a=rwx ${CMAKE_BINARY_DIR}/bin/smpicc" OUTPUT_VARIABLE "OKITOKI")
+  exec_program("chmod a=rwx ${CMAKE_BINARY_DIR}/bin/smpif2c" OUTPUT_VARIABLE "OKITOKI")
+  exec_program("chmod a=rwx ${CMAKE_BINARY_DIR}/bin/smpiff" OUTPUT_VARIABLE "OKITOKI")
+  exec_program("chmod a=rwx ${CMAKE_BINARY_DIR}/bin/smpirun" OUTPUT_VARIABLE "OKITOKI")
 endif(enable_smpi AND NOT WIN32)
-       
+
 ### For code coverage
 ### Set some variables
 SET(UPDATE_TYPE "svn")
@@ -24,518 +24,517 @@ INCLUDE(CTest)
 ENABLE_TESTING()
 
 if(NOT enable_memcheck)
-ADD_TEST(tesh-self-basic               ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv bindir=${CMAKE_BINARY_DIR}/bin --cd "${CMAKE_HOME_DIRECTORY}/tools/tesh" basic.tesh)
-ADD_TEST(tesh-self-cd                  ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd "${CMAKE_BINARY_DIR}/bin" ${CMAKE_HOME_DIRECTORY}/tools/tesh/cd.tesh)
-ADD_TEST(tesh-self-IO-broken-pipe      ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd "${CMAKE_HOME_DIRECTORY}/tools/tesh" IO-broken-pipe.tesh)
-ADD_TEST(tesh-self-IO-orders           ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd "${CMAKE_BINARY_DIR}/bin" ${CMAKE_HOME_DIRECTORY}/tools/tesh/IO-orders.tesh)
-ADD_TEST(tesh-self-IO-bigsize          ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd "${CMAKE_HOME_DIRECTORY}/tools/tesh" IO-bigsize.tesh)
-ADD_TEST(tesh-self-set-return          ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd "${CMAKE_HOME_DIRECTORY}/tools/tesh" set-return.tesh)
-ADD_TEST(tesh-self-set-signal          ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd "${CMAKE_HOME_DIRECTORY}/tools/tesh" set-signal.tesh)
-ADD_TEST(tesh-self-set-timeout         ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd "${CMAKE_HOME_DIRECTORY}/tools/tesh" set-timeout.tesh)
-ADD_TEST(tesh-self-set-ignore-output   ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd "${CMAKE_BINARY_DIR}/bin" ${CMAKE_HOME_DIRECTORY}/tools/tesh/set-ignore-output.tesh)
-ADD_TEST(tesh-self-catch-return                ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd "${CMAKE_BINARY_DIR}/bin" ${CMAKE_HOME_DIRECTORY}/tools/tesh/catch-return.tesh)
-ADD_TEST(tesh-self-catch-signal                ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd "${CMAKE_BINARY_DIR}/bin" ${CMAKE_HOME_DIRECTORY}/tools/tesh/catch-signal.tesh)
-ADD_TEST(tesh-self-catch-timeout       ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd "${CMAKE_BINARY_DIR}/bin" ${CMAKE_HOME_DIRECTORY}/tools/tesh/catch-timeout.tesh)
-ADD_TEST(tesh-self-catch-wrong-output  ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd "${CMAKE_BINARY_DIR}/bin" ${CMAKE_HOME_DIRECTORY}/tools/tesh/catch-wrong-output.tesh)
-ADD_TEST(tesh-self-bg-basic            ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd "${CMAKE_HOME_DIRECTORY}/tools/tesh" bg-basic.tesh)
-ADD_TEST(tesh-self-bg-set-signal       ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd "${CMAKE_HOME_DIRECTORY}/tools/tesh" bg-set-signal.tesh)
-ADD_TEST(tesh-self-background          ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd "${CMAKE_HOME_DIRECTORY}/tools/tesh" background.tesh)
-
-# BEGIN TESH TESTS
-
-# test for code coverage
-ADD_TEST(help ${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms/basic_parsing_test --help)
-ADD_TEST(help-models ${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms/basic_parsing_test --help-models)
-
-# teshsuite/xbt
-ADD_TEST(tesh-log-large                ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/xbt/log_large_test.tesh)
-ADD_TEST(tesh-log-parallel     ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/xbt/parallel_log_crashtest.tesh)
-
-# teshsuite/gras/datadesc directory
-ADD_TEST(tesh-gras-dd-mem      ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/gras/datadesc/datadesc_mem.tesh)
-ADD_TEST(tesh-gras-dd-rw       ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/gras/datadesc/datadesc_rw.tesh)
-ADD_TEST(tesh-gras-dd-r-little32-4     ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite   --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/gras/datadesc/datadesc_r_little32_4.tesh)
-ADD_TEST(tesh-gras-dd-r-little64       ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite   --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/gras/datadesc/datadesc_r_little64.tesh)
-ADD_TEST(tesh-gras-dd-r-big32-8-4      ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite   --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/gras/datadesc/datadesc_r_big32_8_4.tesh)
-
-IF(${ARCH_32_BITS})
-  ADD_TEST(tesh-gras-msg-handle-sg-32  ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/gras/msg_handle/test_sg_32.tesh)
-ELSE(${ARCH_32_BITS})
-  ADD_TEST(tesh-gras-msg-handle-sg-64  ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/gras/msg_handle/test_sg_64.tesh)
-ENDIF(${ARCH_32_BITS})
-
-ADD_TEST(tesh-gras-empty-main-rl       ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/gras/empty_main       --cd ${CMAKE_HOME_DIRECTORY}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/gras/empty_main/test_rl.tesh)
-ADD_TEST(tesh-gras-empty-main-sg       ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/gras/empty_main       --cd ${CMAKE_HOME_DIRECTORY}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/gras/empty_main/test_sg.tesh)
-
-IF(${ARCH_32_BITS})
-  ADD_TEST(tesh-gras-small-sleep-sg-32 ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/gras/small_sleep      --cd ${CMAKE_HOME_DIRECTORY}/teshsuite gras/small_sleep/test_sg_32.tesh)
-ELSE(${ARCH_32_BITS})
-  ADD_TEST(tesh-gras-small-sleep-sg-64 ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/gras/small_sleep      --cd ${CMAKE_HOME_DIRECTORY}/teshsuite gras/small_sleep/test_sg_64.tesh)
-ENDIF(${ARCH_32_BITS})
-
-# GRAS examples
-ADD_TEST(gras-ping-rl                  ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cd ${CMAKE_BINARY_DIR}/examples/gras/ping     ${CMAKE_HOME_DIRECTORY}/examples/gras/ping/test_rl.tesh)
-ADD_TEST(gras-rpc-rl                   ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cd ${CMAKE_BINARY_DIR}/examples/gras/rpc              ${CMAKE_HOME_DIRECTORY}/examples/gras/rpc/test_rl.tesh)
-ADD_TEST(gras-spawn-rl                 ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cd ${CMAKE_BINARY_DIR}/examples/gras/spawn    ${CMAKE_HOME_DIRECTORY}/examples/gras/spawn/test_rl.tesh)
-ADD_TEST(gras-timer-rl                 ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cd ${CMAKE_BINARY_DIR}/examples/gras/timer    ${CMAKE_HOME_DIRECTORY}/examples/gras/timer/test_rl.tesh)
-ADD_TEST(gras-chrono-rl                        ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cd ${CMAKE_BINARY_DIR}/examples/gras/chrono   ${CMAKE_HOME_DIRECTORY}/examples/gras/chrono/test_rl.tesh)
-ADD_TEST(gras-simple-token-rl  ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cd ${CMAKE_BINARY_DIR}/examples/gras/mutual_exclusion/simple_token ${CMAKE_HOME_DIRECTORY}/examples/gras/mutual_exclusion/simple_token/test_rl.tesh)
-ADD_TEST(gras-mmrpc-rl                 ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cd ${CMAKE_BINARY_DIR}/examples/gras/mmrpc    ${CMAKE_HOME_DIRECTORY}/examples/gras/mmrpc/test_rl.tesh)
-ADD_TEST(gras-all2all-rl               ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cd ${CMAKE_BINARY_DIR}/examples/gras/all2all  ${CMAKE_HOME_DIRECTORY}/examples/gras/all2all/test_rl.tesh)
-ADD_TEST(gras-pmm-rl                   ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cd ${CMAKE_BINARY_DIR}/examples/gras/pmm              ${CMAKE_HOME_DIRECTORY}/examples/gras/pmm/test_rl.tesh)
-ADD_TEST(gras-synchro-rl               ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cd ${CMAKE_BINARY_DIR}/examples/gras/synchro  ${CMAKE_HOME_DIRECTORY}/examples/gras/synchro/test_rl.tesh)
-ADD_TEST(gras-properties-rl            ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cd ${CMAKE_BINARY_DIR}/examples/gras/properties ${CMAKE_HOME_DIRECTORY}/examples/gras/properties/test_rl.tesh)
-
-# BEGIN CONTEXTS FACTORY
-ADD_TEST(tesh-msg-get-sender-thread    ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:thread           --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite       --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/msg/get_sender.tesh)
-if(HAVE_RAWCTX)
-       ADD_TEST(tesh-msg-get-sender-raw                ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:raw              --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite       --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/msg/get_sender.tesh)
-endif(HAVE_RAWCTX)
-if(CONTEXT_UCONTEXT)
-       ADD_TEST(tesh-msg-get-sender-ucontext   ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite       --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/msg/get_sender.tesh)
-endif(CONTEXT_UCONTEXT)
-
-IF(enable_debug) # these tests need the assertion mechanism
-       ADD_TEST(tesh-simdag-parser-bogus-symmetric     ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}             --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms  --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms two_hosts_asymetric.tesh)
-ENDIF(enable_debug)
-
-ADD_TEST(tesh-simdag-bypass     ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms --setenv srcdir=${CMAKE_HOME_DIRECTORY} --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms basic_parsing_test_bypass.tesh)
-ADD_TEST(tesh-simdag-flatifier ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms --setenv srcdir=${CMAKE_HOME_DIRECTORY} --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms flatifier.tesh)
-ADD_TEST(tesh-simdag-link      ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms --setenv srcdir=${CMAKE_HOME_DIRECTORY} --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms basic_link_test.tesh)
-
-ADD_TEST(tesh-simdag-reinit-costs      ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite       --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/network/test_reinit_costs.tesh)
-ADD_TEST(tesh-simdag-parser    ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}             --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms  --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms basic_parsing_test.tesh)
-ADD_TEST(tesh-simdag-parser-sym-full           ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms  --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms basic_parsing_test_sym_full.tesh)
-ADD_TEST(tesh-simdag-full-links                ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms  --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms get_full_link.tesh)
-ADD_TEST(tesh-simdag-basic0            ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite       --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/basic0.tesh)
-ADD_TEST(tesh-simdag-basic1            ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite       --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/basic1.tesh)
-ADD_TEST(tesh-simdag-basic2            ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite       --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/basic2.tesh)
-ADD_TEST(tesh-simdag-basic3            ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite       --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/basic3.tesh)
-ADD_TEST(tesh-simdag-basic4            ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite       --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/basic4.tesh)
-ADD_TEST(tesh-simdag-basic5            ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite       --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/basic5.tesh)
-ADD_TEST(tesh-simdag-basic6            ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite       --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/basic6.tesh)
-ADD_TEST(tesh-simdag-incomplete                ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite       --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/incomplete.tesh)
-ADD_TEST(tesh-simdag-p2p-1             ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite       --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/network/p2p/test_latency1.tesh)
-ADD_TEST(tesh-simdag-p2p-2             ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite       --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/network/p2p/test_latency2.tesh)
-ADD_TEST(tesh-simdag-p2p-3             ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite       --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/network/p2p/test_latency3.tesh)
-ADD_TEST(tesh-simdag-p2p-4             ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite       --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/network/p2p/test_latency_bound.tesh)
-ADD_TEST(tesh-simdag-mxn-1             ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite       --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/network/mxn/test_intra_all2all.tesh)
-ADD_TEST(tesh-simdag-mxn-2             ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite       --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/network/mxn/test_intra_independent_comm.tesh)
-ADD_TEST(tesh-simdag-mxn-3             ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite       --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/network/mxn/test_intra_scatter.tesh)
-ADD_TEST(tesh-simdag-par-1             ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite       --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/partask/test_comp_only_seq.tesh)
-ADD_TEST(tesh-simdag-par-2             ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite       --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/partask/test_comp_only_par.tesh)
-
-# MSG examples
-ADD_TEST(msg-file               ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/ --setenv srcdir=${CMAKE_HOME_DIRECTORY}/ --cd ${CMAKE_HOME_DIRECTORY}/examples/ ${CMAKE_HOME_DIRECTORY}/examples/msg/io/io.tesh)
-ADD_TEST(msg-start-kill-time ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/ --setenv srcdir=${CMAKE_HOME_DIRECTORY}/ --cd ${CMAKE_HOME_DIRECTORY}/examples/ ${CMAKE_HOME_DIRECTORY}/examples/msg/start_kill_time/start_kill_time.tesh)
-
-ADD_TEST(msg-sendrecv-CLM03-thread     ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:thread           --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/sendrecv/sendrecv_CLM03.tesh)
-ADD_TEST(msg-sendrecv-Vegas-thread     ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:thread           --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/sendrecv/sendrecv_Vegas.tesh)
-ADD_TEST(msg-sendrecv-Reno-thread      ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:thread           --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/sendrecv/sendrecv_Reno.tesh)
-ADD_TEST(msg-suspend-thread    ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:thread           --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/suspend/suspend.tesh)
-ADD_TEST(msg-masterslave-bypass-thread ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:thread           --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_bypass.tesh)
-ADD_TEST(msg-masterslave-kill-thread   ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:thread           --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_kill.tesh)
-ADD_TEST(msg-masterslave-multicore-thread   ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread       --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_multicore.tesh)
-
-ADD_TEST(msg-masterslave-no-crosstraffic-mailbox-thread     ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread       --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_mailbox.tesh)
-ADD_TEST(msg-masterslave-no-crosstraffic-thread             ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread       --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave.tesh)
-ADD_TEST(msg-masterslave-no-crosstraffic-forwarder-thread   ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread       --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_forwarder.tesh)
-ADD_TEST(msg-masterslave-no-crosstraffic-failure-thread     ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread       --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_failure.tesh)
-
-ADD_TEST(msg-masterslave-thread                ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread       --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_crosstraffic.tesh)
-ADD_TEST(msg-masterslave-forwarder-thread      ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread       --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_forwarder_crosstraffic.tesh)
-ADD_TEST(msg-masterslave-failure-thread        ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread       --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_failure_crosstraffic.tesh)
-ADD_TEST(msg-masterslave-mailbox-thread        ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread       --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_mailbox_crosstraffic.tesh)
-ADD_TEST(msg-masterslave-cpu-ti-thread         ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread       --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/masterslave    --cd ${CMAKE_HOME_DIRECTORY}/examples/msg masterslave/masterslave_cpu_ti_crosstraffic.tesh)
-
-ADD_TEST(msg-masterslave-virtual-machines ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg     --cd ${CMAKE_HOME_DIRECTORY}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/cloud/masterslave_virtual_machines.tesh)
-
-if(CONTEXT_UCONTEXT)
-       ADD_TEST(msg-sendrecv-CLM03-ucontext    ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/sendrecv/sendrecv_CLM03.tesh)
-       ADD_TEST(msg-sendrecv-Vegas-ucontext    ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/sendrecv/sendrecv_Vegas.tesh)
-       ADD_TEST(msg-sendrecv-Reno-ucontext     ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/sendrecv/sendrecv_Reno.tesh)
-       ADD_TEST(msg-suspend-ucontext   ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/suspend/suspend.tesh)
-       ADD_TEST(msg-masterslave-bypass-ucontext        ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_bypass.tesh)
-    ADD_TEST(msg-masterslave-kill-ucontext         ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_kill.tesh)
-    ADD_TEST(msg-masterslave-multicore-ucontext ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext     --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_multicore.tesh)
-    ADD_TEST(msg-masterslave-no-crosstraffic-mailbox-ucontext     ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext       --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_mailbox.tesh)
-    ADD_TEST(msg-masterslave-no-crosstraffic-ucontext             ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext       --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave.tesh)
-    ADD_TEST(msg-masterslave-no-crosstraffic-forwarder-ucontext   ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext       --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_forwarder.tesh)
-    ADD_TEST(msg-masterslave-no-crosstraffic-failure-ucontext     ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext       --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_failure.tesh)
-    
-    ADD_TEST(msg-masterslave-ucontext                ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext       --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_crosstraffic.tesh)
-    ADD_TEST(msg-masterslave-forwarder-ucontext      ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext       --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_forwarder_crosstraffic.tesh)
-    ADD_TEST(msg-masterslave-failure-ucontext        ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext       --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_failure_crosstraffic.tesh)
-    ADD_TEST(msg-masterslave-mailbox-ucontext        ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext       --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_mailbox_crosstraffic.tesh)
-    ADD_TEST(msg-masterslave-cpu-ti-ucontext         ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext       --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/masterslave    --cd ${CMAKE_HOME_DIRECTORY}/examples/msg masterslave/masterslave_cpu_ti_crosstraffic.tesh)
-endif(CONTEXT_UCONTEXT)
-
-if(HAVE_RAWCTX)
-    ADD_TEST(msg-sendrecv-CLM03-raw            ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:raw              --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/sendrecv/sendrecv_CLM03.tesh)
-    ADD_TEST(msg-sendrecv-Vegas-raw            ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:raw              --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/sendrecv/sendrecv_Vegas.tesh)
-    ADD_TEST(msg-sendrecv-Reno-raw             ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:raw              --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/sendrecv/sendrecv_Reno.tesh)
-    ADD_TEST(msg-suspend-raw           ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:raw              --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/suspend/suspend.tesh)
-    ADD_TEST(msg-masterslave-bypass-raw                ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:raw              --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_bypass.tesh)
-    ADD_TEST(msg-masterslave-kill-raw          ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:raw              --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_kill.tesh)
-    ADD_TEST(msg-masterslave-multicore-raw      ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw       --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_multicore.tesh)
-    ADD_TEST(msg-masterslave-no-crosstraffic-mailbox-raw     ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw       --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_mailbox.tesh)
-    ADD_TEST(msg-masterslave-no-crosstraffic-raw             ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw       --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave.tesh)
-    ADD_TEST(msg-masterslave-no-crosstraffic-forwarder-raw   ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw       --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_forwarder.tesh)
-    ADD_TEST(msg-masterslave-no-crosstraffic-failure-raw     ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw       --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_failure.tesh)
-    
-    ADD_TEST(msg-masterslave-raw                ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw       --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_crosstraffic.tesh)
-    ADD_TEST(msg-masterslave-forwarder-raw      ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw       --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_forwarder_crosstraffic.tesh)
-    ADD_TEST(msg-masterslave-failure-raw        ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw       --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_failure_crosstraffic.tesh)
-    ADD_TEST(msg-masterslave-mailbox-raw        ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw       --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_mailbox_crosstraffic.tesh)
-    ADD_TEST(msg-masterslave-cpu-ti-raw         ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw       --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/masterslave    --cd ${CMAKE_HOME_DIRECTORY}/examples/msg masterslave/masterslave_cpu_ti_crosstraffic.tesh)
-endif(HAVE_RAWCTX)
-
-ADD_TEST(msg-masterslave-vivaldi-thread        ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:thread           --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_vivaldi.tesh)
-ADD_TEST(msg-token-ring-thread ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:thread           --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg/token_ring         --cd ${CMAKE_BINARY_DIR}/examples/msg/token_ring ${CMAKE_HOME_DIRECTORY}/examples/msg/token_ring/token_ring.tesh)
-if(HAVE_RAWCTX)
-  ADD_TEST(msg-masterslave-vivaldi-raw         ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:raw              --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_vivaldi.tesh)
-  ADD_TEST(msg-token-ring-raw          ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:raw              --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg/token_ring         --cd ${CMAKE_BINARY_DIR}/examples/msg/token_ring ${CMAKE_HOME_DIRECTORY}/examples/msg/token_ring/token_ring.tesh)
-endif(HAVE_RAWCTX)
-if(CONTEXT_UCONTEXT)
-       ADD_TEST(msg-masterslave-vivaldi-ucontext       ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_vivaldi.tesh)
-       ADD_TEST(msg-token-ring-ucontext        ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg/token_ring         --cd ${CMAKE_BINARY_DIR}/examples/msg/token_ring ${CMAKE_HOME_DIRECTORY}/examples/msg/token_ring/token_ring.tesh)
-endif(CONTEXT_UCONTEXT)
-
-ADD_TEST(msg-migration-thread  ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:thread           --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/migration/migration.tesh)
-ADD_TEST(msg-ptask-thread      ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:thread           --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/parallel_task/parallel_task.tesh)
-ADD_TEST(msg-priority-thread   ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:thread           --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/priority/priority.tesh)
-ADD_TEST(msg-properties-thread ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:thread           --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/properties/msg_prop.tesh)
-ADD_TEST(msg-icomms-thread     ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:thread           --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg/icomms     --cd ${CMAKE_BINARY_DIR}/examples/msg/icomms ${CMAKE_HOME_DIRECTORY}/examples/msg/icomms/peer.tesh)
-ADD_TEST(msg-actions-thread    ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:thread           --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/actions        --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/actions actions.tesh)
-ADD_TEST(msg-trace-thread      ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:thread           --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/msg       --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/msg trace/trace.tesh)
-ADD_TEST(msg-chord-no-crosstraffic-thread      ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:thread           --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/chord  --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/chord chord.tesh)
-ADD_TEST(msg-chord-no-crosstraffic-thread-parallel     ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:thread           --cfg contexts/nthreads:4       --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/chord  --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/chord chord.tesh)
-ADD_TEST(msg-chord-thread   ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread       --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/chord  --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/chord chord_crosstraffic.tesh)
-ADD_TEST(msg-chord-thread-parallel  ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread       --cfg contexts/nthreads:4   --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/chord  --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/chord chord_crosstraffic.tesh)
-if(CONTEXT_UCONTEXT)
-       ADD_TEST(msg-migration-ucontext ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/migration/migration.tesh)
-       ADD_TEST(msg-ptask-ucontext     ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/parallel_task/parallel_task.tesh)
-       ADD_TEST(msg-priority-ucontext  ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/priority/priority.tesh)
-       ADD_TEST(msg-properties-ucontext        ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/properties/msg_prop.tesh)
-       ADD_TEST(msg-icomms-ucontext    ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg/icomms     --cd ${CMAKE_BINARY_DIR}/examples/msg/icomms ${CMAKE_HOME_DIRECTORY}/examples/msg/icomms/peer.tesh)
-       ADD_TEST(msg-actions-ucontext   ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/actions        --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/actions actions.tesh)
-       ADD_TEST(msg-trace-ucontext     ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/msg       --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/msg trace/trace.tesh)
-       ADD_TEST(msg-chord-no-crosstraffic-ucontext     ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/chord  --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/chord chord.tesh)
-       ADD_TEST(msg-chord-no-crosstraffic-ucontext-parallel    ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --cfg contexts/nthreads:4       --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/chord  --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/chord chord.tesh)
-    ADD_TEST(msg-chord-ucontext            ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext      --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/chord  --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/chord chord_crosstraffic.tesh)
-    ADD_TEST(msg-chord-ucontext-parallel   ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext       --cfg contexts/nthreads:4   --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/chord  --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/chord chord_crosstraffic.tesh)
-endif(CONTEXT_UCONTEXT)
-if(HAVE_RAWCTX)
-    ADD_TEST(msg-migration-raw         ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:raw              --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/migration/migration.tesh)
-    ADD_TEST(msg-ptask-raw             ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:raw              --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/parallel_task/parallel_task.tesh)
-    ADD_TEST(msg-priority-raw          ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:raw              --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/priority/priority.tesh)
-    ADD_TEST(msg-actions-raw           ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:raw              --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/actions        --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/actions actions.tesh)
-    ADD_TEST(msg-icomms-raw            ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:raw              --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg/icomms     --cd ${CMAKE_BINARY_DIR}/examples/msg/icomms ${CMAKE_HOME_DIRECTORY}/examples/msg/icomms/peer.tesh)
-    ADD_TEST(msg-properties-raw                ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:raw              --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/properties/msg_prop.tesh)
-    ADD_TEST(msg-trace-raw             ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:raw              --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/msg       --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/msg trace/trace.tesh)
-    ADD_TEST(msg-chord-no-crosstraffic-raw     ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:raw              --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/chord  --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/chord chord.tesh)
-    ADD_TEST(msg-chord-no-crosstraffic-raw-parallel    ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:raw      --cfg contexts/nthreads:4       --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/chord  --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/chord chord.tesh)
-    ADD_TEST(msg-chord-raw   ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw       --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/chord  --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/chord chord_crosstraffic.tesh)
-    ADD_TEST(msg-chord-raw-parallel  ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw       --cfg contexts/nthreads:4   --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/chord  --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/chord chord_crosstraffic.tesh)
-endif(HAVE_RAWCTX)
-
-IF(${ARCH_32_BITS})
-ADD_TEST(gras-ping-sg-32-thread        ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:thread           --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/ping      --cd ${CMAKE_BINARY_DIR}/examples/gras/ping ${CMAKE_HOME_DIRECTORY}/examples/gras/ping/test_sg_32.tesh)
-ADD_TEST(gras-rpc-sg-32-thread ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:thread           --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/rpc       --cd ${CMAKE_BINARY_DIR}/examples/gras/rpc ${CMAKE_HOME_DIRECTORY}/examples/gras/rpc/test_sg_32.tesh)
-ADD_TEST(gras-spawn-sg-32-thread       ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:thread           --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/spawn     --cd ${CMAKE_BINARY_DIR}/examples/gras/spawn ${CMAKE_HOME_DIRECTORY}/examples/gras/spawn/test_sg_32.tesh)
-ADD_TEST(gras-timer-sg-32-thread       ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:thread           --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/timer     --cd ${CMAKE_BINARY_DIR}/examples/gras/timer ${CMAKE_HOME_DIRECTORY}/examples/gras/timer/test_sg_32.tesh)
-ADD_TEST(gras-chrono-sg-32-thread      ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:thread           --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/chrono    --cd ${CMAKE_BINARY_DIR}/examples/gras/chrono ${CMAKE_HOME_DIRECTORY}/examples/gras/chrono/test_sg_32.tesh)
-ADD_TEST(gras-simple-token-sg-32-thread        ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:thread           --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/mutual_exclusion/simple_token     --cd ${CMAKE_BINARY_DIR}/examples/gras/mutual_exclusion/simple_token ${CMAKE_HOME_DIRECTORY}/examples/gras/mutual_exclusion/simple_token/test_sg_32.tesh)
-ADD_TEST(gras-mmrpc-sg-32-thread       ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:thread           --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/mmrpc     --cd ${CMAKE_BINARY_DIR}/examples/gras/mmrpc ${CMAKE_HOME_DIRECTORY}/examples/gras/mmrpc/test_sg_32.tesh)
-ADD_TEST(gras-all2all-sg-32-thread     ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:thread           --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/all2all   --cd ${CMAKE_BINARY_DIR}/examples/gras/all2all ${CMAKE_HOME_DIRECTORY}/examples/gras/all2all/test_sg_32.tesh)
-ADD_TEST(gras-pmm-sg-32-thread ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:thread           --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/pmm       --cd ${CMAKE_BINARY_DIR}/examples/gras/pmm ${CMAKE_HOME_DIRECTORY}/examples/gras/pmm/test_sg_32.tesh)
-ADD_TEST(gras-synchro-sg-32-thread     ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:thread           --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/synchro   --cd ${CMAKE_BINARY_DIR}/examples/gras/synchro ${CMAKE_HOME_DIRECTORY}/examples/gras/synchro/test_sg_32.tesh)
-if(CONTEXT_UCONTEXT)
-       ADD_TEST(gras-ping-sg-32-ucontext       ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/ping      --cd ${CMAKE_BINARY_DIR}/examples/gras/ping ${CMAKE_HOME_DIRECTORY}/examples/gras/ping/test_sg_32.tesh)
-       ADD_TEST(gras-rpc-sg-32-ucontext        ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/rpc       --cd ${CMAKE_BINARY_DIR}/examples/gras/rpc ${CMAKE_HOME_DIRECTORY}/examples/gras/rpc/test_sg_32.tesh)
-       ADD_TEST(gras-spawn-sg-32-ucontext      ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/spawn     --cd ${CMAKE_BINARY_DIR}/examples/gras/spawn ${CMAKE_HOME_DIRECTORY}/examples/gras/spawn/test_sg_32.tesh)
-       ADD_TEST(gras-timer-sg-32-ucontext      ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/timer     --cd ${CMAKE_BINARY_DIR}/examples/gras/timer ${CMAKE_HOME_DIRECTORY}/examples/gras/timer/test_sg_32.tesh)
-       ADD_TEST(gras-chrono-sg-32-ucontext     ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/chrono    --cd ${CMAKE_BINARY_DIR}/examples/gras/chrono ${CMAKE_HOME_DIRECTORY}/examples/gras/chrono/test_sg_32.tesh)
-       ADD_TEST(gras-simple-token-sg-32-ucontext       ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/mutual_exclusion/simple_token     --cd ${CMAKE_BINARY_DIR}/examples/gras/mutual_exclusion/simple_token ${CMAKE_HOME_DIRECTORY}/examples/gras/mutual_exclusion/simple_token/test_sg_32.tesh)
-       ADD_TEST(gras-mmrpc-sg-32-ucontext      ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/mmrpc     --cd ${CMAKE_BINARY_DIR}/examples/gras/mmrpc ${CMAKE_HOME_DIRECTORY}/examples/gras/mmrpc/test_sg_32.tesh)
-       ADD_TEST(gras-all2all-sg-32-ucontext    ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/all2all   --cd ${CMAKE_BINARY_DIR}/examples/gras/all2all ${CMAKE_HOME_DIRECTORY}/examples/gras/all2all/test_sg_32.tesh)
-       ADD_TEST(gras-pmm-sg-32-ucontext        ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/pmm       --cd ${CMAKE_BINARY_DIR}/examples/gras/pmm ${CMAKE_HOME_DIRECTORY}/examples/gras/pmm/test_sg_32.tesh)
-       ADD_TEST(gras-synchro-sg-32-ucontext    ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/synchro   --cd ${CMAKE_BINARY_DIR}/examples/gras/synchro ${CMAKE_HOME_DIRECTORY}/examples/gras/synchro/test_sg_32.tesh)
-endif(CONTEXT_UCONTEXT)
-if(HAVE_RAWCTX)
-  ADD_TEST(gras-ping-sg-32-raw         ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:raw              --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/ping      --cd ${CMAKE_BINARY_DIR}/examples/gras/ping ${CMAKE_HOME_DIRECTORY}/examples/gras/ping/test_sg_32.tesh)
-  ADD_TEST(gras-rpc-sg-32-raw          ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:raw              --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/rpc       --cd ${CMAKE_BINARY_DIR}/examples/gras/rpc ${CMAKE_HOME_DIRECTORY}/examples/gras/rpc/test_sg_32.tesh)
-  ADD_TEST(gras-spawn-sg-32-raw                ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:raw              --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/spawn     --cd ${CMAKE_BINARY_DIR}/examples/gras/spawn ${CMAKE_HOME_DIRECTORY}/examples/gras/spawn/test_sg_32.tesh)
-  ADD_TEST(gras-timer-sg-32-raw                ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:raw              --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/timer     --cd ${CMAKE_BINARY_DIR}/examples/gras/timer ${CMAKE_HOME_DIRECTORY}/examples/gras/timer/test_sg_32.tesh)
-  ADD_TEST(gras-chrono-sg-32-raw               ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:raw              --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/chrono    --cd ${CMAKE_BINARY_DIR}/examples/gras/chrono ${CMAKE_HOME_DIRECTORY}/examples/gras/chrono/test_sg_32.tesh)
-  ADD_TEST(gras-simple-token-sg-32-raw         ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:raw              --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/mutual_exclusion/simple_token     --cd ${CMAKE_BINARY_DIR}/examples/gras/mutual_exclusion/simple_token ${CMAKE_HOME_DIRECTORY}/examples/gras/mutual_exclusion/simple_token/test_sg_32.tesh)
-  ADD_TEST(gras-mmrpc-sg-32-raw                ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:raw              --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/mmrpc     --cd ${CMAKE_BINARY_DIR}/examples/gras/mmrpc ${CMAKE_HOME_DIRECTORY}/examples/gras/mmrpc/test_sg_32.tesh)
-  ADD_TEST(gras-all2all-sg-32-raw              ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:raw              --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/all2all   --cd ${CMAKE_BINARY_DIR}/examples/gras/all2all ${CMAKE_HOME_DIRECTORY}/examples/gras/all2all/test_sg_32.tesh)
-  ADD_TEST(gras-pmm-sg-32-raw          ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:raw              --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/pmm       --cd ${CMAKE_BINARY_DIR}/examples/gras/pmm ${CMAKE_HOME_DIRECTORY}/examples/gras/pmm/test_sg_32.tesh)
-  ADD_TEST(gras-synchro-sg-32-raw              ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:raw              --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/synchro   --cd ${CMAKE_BINARY_DIR}/examples/gras/synchro ${CMAKE_HOME_DIRECTORY}/examples/gras/synchro/test_sg_32.tesh)
-endif(HAVE_RAWCTX)
-
-ELSE(${ARCH_32_BITS})
-ADD_TEST(gras-ping-sg-64-thread        ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:thread           --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/ping      --cd ${CMAKE_BINARY_DIR}/examples/gras/ping ${CMAKE_HOME_DIRECTORY}/examples/gras/ping/test_sg_64.tesh)
-ADD_TEST(gras-rpc-sg-64-thread ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:thread           --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/rpc       --cd ${CMAKE_BINARY_DIR}/examples/gras/rpc ${CMAKE_HOME_DIRECTORY}/examples/gras/rpc/test_sg_64.tesh)
-ADD_TEST(gras-spawn-sg-64-thread       ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:thread           --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/spawn     --cd ${CMAKE_BINARY_DIR}/examples/gras/spawn ${CMAKE_HOME_DIRECTORY}/examples/gras/spawn/test_sg_64.tesh)
-ADD_TEST(gras-timer-sg-64-thread       ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:thread           --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/timer     --cd ${CMAKE_BINARY_DIR}/examples/gras/timer ${CMAKE_HOME_DIRECTORY}/examples/gras/timer/test_sg_64.tesh)
-ADD_TEST(gras-chrono-sg-64-thread      ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:thread           --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/chrono    --cd ${CMAKE_BINARY_DIR}/examples/gras/chrono ${CMAKE_HOME_DIRECTORY}/examples/gras/chrono/test_sg_64.tesh)
-ADD_TEST(gras-simple-token-sg-64-thread        ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:thread           --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/mutual_exclusion/simple_token     --cd ${CMAKE_BINARY_DIR}/examples/gras/mutual_exclusion/simple_token ${CMAKE_HOME_DIRECTORY}/examples/gras/mutual_exclusion/simple_token/test_sg_64.tesh)
-ADD_TEST(gras-mmrpc-sg-64-thread       ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:thread           --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/mmrpc     --cd ${CMAKE_BINARY_DIR}/examples/gras/mmrpc ${CMAKE_HOME_DIRECTORY}/examples/gras/mmrpc/test_sg_64.tesh)
-ADD_TEST(gras-all2all-sg-64-thread     ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:thread           --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/all2all   --cd ${CMAKE_BINARY_DIR}/examples/gras/all2all ${CMAKE_HOME_DIRECTORY}/examples/gras/all2all/test_sg_64.tesh)
-ADD_TEST(gras-pmm-sg-64-thread ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:thread           --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/pmm       --cd ${CMAKE_BINARY_DIR}/examples/gras/pmm ${CMAKE_HOME_DIRECTORY}/examples/gras/pmm/test_sg_64.tesh)
-ADD_TEST(gras-synchro-sg-64-thread     ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:thread           --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/synchro   --cd ${CMAKE_BINARY_DIR}/examples/gras/synchro ${CMAKE_HOME_DIRECTORY}/examples/gras/synchro/test_sg_64.tesh)
-if(CONTEXT_UCONTEXT)
-       ADD_TEST(gras-ping-sg-64-ucontext       ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/ping      --cd ${CMAKE_BINARY_DIR}/examples/gras/ping ${CMAKE_HOME_DIRECTORY}/examples/gras/ping/test_sg_64.tesh)
-       ADD_TEST(gras-rpc-sg-64-ucontext        ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/rpc       --cd ${CMAKE_BINARY_DIR}/examples/gras/rpc ${CMAKE_HOME_DIRECTORY}/examples/gras/rpc/test_sg_64.tesh)
-       ADD_TEST(gras-spawn-sg-64-ucontext      ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/spawn     --cd ${CMAKE_BINARY_DIR}/examples/gras/spawn ${CMAKE_HOME_DIRECTORY}/examples/gras/spawn/test_sg_64.tesh)
-       ADD_TEST(gras-timer-sg-64-ucontext      ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/timer     --cd ${CMAKE_BINARY_DIR}/examples/gras/timer ${CMAKE_HOME_DIRECTORY}/examples/gras/timer/test_sg_64.tesh)
-       ADD_TEST(gras-chrono-sg-64-ucontext     ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/chrono    --cd ${CMAKE_BINARY_DIR}/examples/gras/chrono ${CMAKE_HOME_DIRECTORY}/examples/gras/chrono/test_sg_64.tesh)
-       ADD_TEST(gras-simple-token-sg-64-ucontext       ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/mutual_exclusion/simple_token     --cd ${CMAKE_BINARY_DIR}/examples/gras/mutual_exclusion/simple_token ${CMAKE_HOME_DIRECTORY}/examples/gras/mutual_exclusion/simple_token/test_sg_64.tesh)
-       ADD_TEST(gras-mmrpc-sg-64-ucontext      ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/mmrpc     --cd ${CMAKE_BINARY_DIR}/examples/gras/mmrpc ${CMAKE_HOME_DIRECTORY}/examples/gras/mmrpc/test_sg_64.tesh)
-       ADD_TEST(gras-all2all-sg-64-ucontext    ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/all2all   --cd ${CMAKE_BINARY_DIR}/examples/gras/all2all ${CMAKE_HOME_DIRECTORY}/examples/gras/all2all/test_sg_64.tesh)
-       ADD_TEST(gras-pmm-sg-64-ucontext        ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/pmm       --cd ${CMAKE_BINARY_DIR}/examples/gras/pmm ${CMAKE_HOME_DIRECTORY}/examples/gras/pmm/test_sg_64.tesh)
-       ADD_TEST(gras-synchro-sg-64-ucontext    ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/synchro   --cd ${CMAKE_BINARY_DIR}/examples/gras/synchro ${CMAKE_HOME_DIRECTORY}/examples/gras/synchro/test_sg_64.tesh)
-endif(CONTEXT_UCONTEXT)
-if(HAVE_RAWCTX)
-  ADD_TEST(gras-ping-sg-64-raw         ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:raw              --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/ping      --cd ${CMAKE_BINARY_DIR}/examples/gras/ping ${CMAKE_HOME_DIRECTORY}/examples/gras/ping/test_sg_64.tesh)
-  ADD_TEST(gras-rpc-sg-64-raw          ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:raw              --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/rpc       --cd ${CMAKE_BINARY_DIR}/examples/gras/rpc ${CMAKE_HOME_DIRECTORY}/examples/gras/rpc/test_sg_64.tesh)
-  ADD_TEST(gras-spawn-sg-64-raw                ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:raw              --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/spawn     --cd ${CMAKE_BINARY_DIR}/examples/gras/spawn ${CMAKE_HOME_DIRECTORY}/examples/gras/spawn/test_sg_64.tesh)
-  ADD_TEST(gras-timer-sg-64-raw                ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:raw              --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/timer     --cd ${CMAKE_BINARY_DIR}/examples/gras/timer ${CMAKE_HOME_DIRECTORY}/examples/gras/timer/test_sg_64.tesh)
-  ADD_TEST(gras-chrono-sg-64-raw               ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:raw              --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/chrono    --cd ${CMAKE_BINARY_DIR}/examples/gras/chrono ${CMAKE_HOME_DIRECTORY}/examples/gras/chrono/test_sg_64.tesh)
-  ADD_TEST(gras-simple-token-sg-64-raw         ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:raw              --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/mutual_exclusion/simple_token     --cd ${CMAKE_BINARY_DIR}/examples/gras/mutual_exclusion/simple_token ${CMAKE_HOME_DIRECTORY}/examples/gras/mutual_exclusion/simple_token/test_sg_64.tesh)
-  ADD_TEST(gras-mmrpc-sg-64-raw                ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:raw              --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/mmrpc     --cd ${CMAKE_BINARY_DIR}/examples/gras/mmrpc ${CMAKE_HOME_DIRECTORY}/examples/gras/mmrpc/test_sg_64.tesh)
-  ADD_TEST(gras-all2all-sg-64-raw              ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:raw              --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/all2all   --cd ${CMAKE_BINARY_DIR}/examples/gras/all2all ${CMAKE_HOME_DIRECTORY}/examples/gras/all2all/test_sg_64.tesh)
-  ADD_TEST(gras-pmm-sg-64-raw          ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:raw              --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/pmm       --cd ${CMAKE_BINARY_DIR}/examples/gras/pmm ${CMAKE_HOME_DIRECTORY}/examples/gras/pmm/test_sg_64.tesh)
-  ADD_TEST(gras-synchro-sg-64-raw              ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:raw              --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/synchro   --cd ${CMAKE_BINARY_DIR}/examples/gras/synchro ${CMAKE_HOME_DIRECTORY}/examples/gras/synchro/test_sg_64.tesh)
-endif(HAVE_RAWCTX)
-
-ENDIF(${ARCH_32_BITS})
-ADD_TEST(gras-properties-sg-thread     ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:thread           --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/properties        --cd ${CMAKE_BINARY_DIR}/examples/gras/properties ${CMAKE_HOME_DIRECTORY}/examples/gras/properties/test_sg.tesh)
-if(CONTEXT_UCONTEXT)
-       ADD_TEST(gras-properties-sg-ucontext    ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/properties        --cd ${CMAKE_BINARY_DIR}/examples/gras/properties ${CMAKE_HOME_DIRECTORY}/examples/gras/properties/test_sg.tesh)
-endif(CONTEXT_UCONTEXT)
-if(HAVE_RAWCTX)
-  ADD_TEST(gras-properties-sg-raw              ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:raw              --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/properties        --cd ${CMAKE_BINARY_DIR}/examples/gras/properties ${CMAKE_HOME_DIRECTORY}/examples/gras/properties/test_sg.tesh)
-endif(HAVE_RAWCTX)
-
-# amok examples
-ADD_TEST(amok-bandwidth-rl     ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cd ${CMAKE_BINARY_DIR}/examples/amok ${CMAKE_HOME_DIRECTORY}/examples/amok/bandwidth/bandwidth_rl.tesh)
-ADD_TEST(amok-saturate-rl      ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cd ${CMAKE_BINARY_DIR}/examples/amok ${CMAKE_HOME_DIRECTORY}/examples/amok/saturate/saturate_rl.tesh)
-
-IF(${ARCH_32_BITS})
-  ADD_TEST(amok-bandwidth-sg-32-thread ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:thread           --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/amok   --cd ${CMAKE_BINARY_DIR}/examples/amok ${CMAKE_HOME_DIRECTORY}/examples/amok/bandwidth/bandwidth_sg_32.tesh)
-  ADD_TEST(amok-saturate-sg-32-thread  ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:thread           --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/amok   --cd ${CMAKE_BINARY_DIR}/examples/amok ${CMAKE_HOME_DIRECTORY}/examples/amok/saturate/saturate_sg_32.tesh)
+  ADD_TEST(tesh-self-basic                      ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv bindir=${CMAKE_BINARY_DIR}/bin --cd "${CMAKE_HOME_DIRECTORY}/tools/tesh" basic.tesh)
+  ADD_TEST(tesh-self-cd                         ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd "${CMAKE_BINARY_DIR}/bin" ${CMAKE_HOME_DIRECTORY}/tools/tesh/cd.tesh)
+  ADD_TEST(tesh-self-IO-broken-pipe             ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd "${CMAKE_HOME_DIRECTORY}/tools/tesh" IO-broken-pipe.tesh)
+  ADD_TEST(tesh-self-IO-orders                  ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd "${CMAKE_BINARY_DIR}/bin" ${CMAKE_HOME_DIRECTORY}/tools/tesh/IO-orders.tesh)
+  ADD_TEST(tesh-self-IO-bigsize                 ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd "${CMAKE_HOME_DIRECTORY}/tools/tesh" IO-bigsize.tesh)
+  ADD_TEST(tesh-self-set-return                 ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd "${CMAKE_HOME_DIRECTORY}/tools/tesh" set-return.tesh)
+  ADD_TEST(tesh-self-set-signal                 ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd "${CMAKE_HOME_DIRECTORY}/tools/tesh" set-signal.tesh)
+  ADD_TEST(tesh-self-set-timeout                ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd "${CMAKE_HOME_DIRECTORY}/tools/tesh" set-timeout.tesh)
+  ADD_TEST(tesh-self-set-ignore-output          ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd "${CMAKE_BINARY_DIR}/bin" ${CMAKE_HOME_DIRECTORY}/tools/tesh/set-ignore-output.tesh)
+  ADD_TEST(tesh-self-catch-return               ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd "${CMAKE_BINARY_DIR}/bin" ${CMAKE_HOME_DIRECTORY}/tools/tesh/catch-return.tesh)
+  ADD_TEST(tesh-self-catch-signal               ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd "${CMAKE_BINARY_DIR}/bin" ${CMAKE_HOME_DIRECTORY}/tools/tesh/catch-signal.tesh)
+  ADD_TEST(tesh-self-catch-timeout              ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd "${CMAKE_BINARY_DIR}/bin" ${CMAKE_HOME_DIRECTORY}/tools/tesh/catch-timeout.tesh)
+  ADD_TEST(tesh-self-catch-wrong-output         ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd "${CMAKE_BINARY_DIR}/bin" ${CMAKE_HOME_DIRECTORY}/tools/tesh/catch-wrong-output.tesh)
+  ADD_TEST(tesh-self-bg-basic                   ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd "${CMAKE_HOME_DIRECTORY}/tools/tesh" bg-basic.tesh)
+  ADD_TEST(tesh-self-bg-set-signal              ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd "${CMAKE_HOME_DIRECTORY}/tools/tesh" bg-set-signal.tesh)
+  ADD_TEST(tesh-self-background                 ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd "${CMAKE_HOME_DIRECTORY}/tools/tesh" background.tesh)
+
+  # BEGIN TESH TESTS
+
+  # test for code coverage
+  ADD_TEST(help                                 ${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms/basic_parsing_test --help)
+  ADD_TEST(help-models                          ${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms/basic_parsing_test --help-models)
+
+  # teshsuite/xbt
+  ADD_TEST(tesh-log-large                       ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/xbt/log_large_test.tesh)
+  ADD_TEST(tesh-log-parallel                    ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/xbt/parallel_log_crashtest.tesh)
+
+  # teshsuite/gras/datadesc directory
+  ADD_TEST(tesh-gras-dd-mem                     ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/gras/datadesc/datadesc_mem.tesh)
+  ADD_TEST(tesh-gras-dd-rw                      ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/gras/datadesc/datadesc_rw.tesh)
+  ADD_TEST(tesh-gras-dd-r-little32-4            ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/gras/datadesc/datadesc_r_little32_4.tesh)
+  ADD_TEST(tesh-gras-dd-r-little64              ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/gras/datadesc/datadesc_r_little64.tesh)
+  ADD_TEST(tesh-gras-dd-r-big32-8-4             ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/gras/datadesc/datadesc_r_big32_8_4.tesh)
+
+  IF(${ARCH_32_BITS})
+    ADD_TEST(tesh-gras-msg-handle-sg-32         ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/gras/msg_handle/test_sg_32.tesh)
+  ELSE(${ARCH_32_BITS})
+    ADD_TEST(tesh-gras-msg-handle-sg-64         ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/gras/msg_handle/test_sg_64.tesh)
+  ENDIF(${ARCH_32_BITS})
+
+  ADD_TEST(tesh-gras-empty-main-rl              ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/gras/empty_main --cd ${CMAKE_HOME_DIRECTORY}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/gras/empty_main/test_rl.tesh)
+  ADD_TEST(tesh-gras-empty-main-sg              ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/gras/empty_main --cd ${CMAKE_HOME_DIRECTORY}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/gras/empty_main/test_sg.tesh)
+
+  IF(${ARCH_32_BITS})
+    ADD_TEST(tesh-gras-small-sleep-sg-32        ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/gras/small_sleep --cd ${CMAKE_HOME_DIRECTORY}/teshsuite gras/small_sleep/test_sg_32.tesh)
+  ELSE(${ARCH_32_BITS})
+    ADD_TEST(tesh-gras-small-sleep-sg-64        ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/gras/small_sleep --cd ${CMAKE_HOME_DIRECTORY}/teshsuite gras/small_sleep/test_sg_64.tesh)
+  ENDIF(${ARCH_32_BITS})
+
+  # GRAS examples
+  ADD_TEST(gras-ping-rl                         ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd ${CMAKE_BINARY_DIR}/examples/gras/ping ${CMAKE_HOME_DIRECTORY}/examples/gras/ping/test_rl.tesh)
+  ADD_TEST(gras-rpc-rl                          ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd ${CMAKE_BINARY_DIR}/examples/gras/rpc ${CMAKE_HOME_DIRECTORY}/examples/gras/rpc/test_rl.tesh)
+  ADD_TEST(gras-spawn-rl                        ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd ${CMAKE_BINARY_DIR}/examples/gras/spawn ${CMAKE_HOME_DIRECTORY}/examples/gras/spawn/test_rl.tesh)
+  ADD_TEST(gras-timer-rl                        ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd ${CMAKE_BINARY_DIR}/examples/gras/timer ${CMAKE_HOME_DIRECTORY}/examples/gras/timer/test_rl.tesh)
+  ADD_TEST(gras-chrono-rl                       ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd ${CMAKE_BINARY_DIR}/examples/gras/chrono ${CMAKE_HOME_DIRECTORY}/examples/gras/chrono/test_rl.tesh)
+  ADD_TEST(gras-simple-token-rl                 ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd ${CMAKE_BINARY_DIR}/examples/gras/mutual_exclusion/simple_token ${CMAKE_HOME_DIRECTORY}/examples/gras/mutual_exclusion/simple_token/test_rl.tesh)
+  ADD_TEST(gras-mmrpc-rl                        ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd ${CMAKE_BINARY_DIR}/examples/gras/mmrpc ${CMAKE_HOME_DIRECTORY}/examples/gras/mmrpc/test_rl.tesh)
+  ADD_TEST(gras-all2all-rl                      ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd ${CMAKE_BINARY_DIR}/examples/gras/all2all ${CMAKE_HOME_DIRECTORY}/examples/gras/all2all/test_rl.tesh)
+  ADD_TEST(gras-pmm-rl                          ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd ${CMAKE_BINARY_DIR}/examples/gras/pmm ${CMAKE_HOME_DIRECTORY}/examples/gras/pmm/test_rl.tesh)
+  ADD_TEST(gras-synchro-rl                      ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd ${CMAKE_BINARY_DIR}/examples/gras/synchro ${CMAKE_HOME_DIRECTORY}/examples/gras/synchro/test_rl.tesh)
+  ADD_TEST(gras-properties-rl                   ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd ${CMAKE_BINARY_DIR}/examples/gras/properties ${CMAKE_HOME_DIRECTORY}/examples/gras/properties/test_rl.tesh)
+
+  # BEGIN CONTEXTS FACTORY
+  ADD_TEST(tesh-msg-get-sender-thread           ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/msg/get_sender.tesh)
   if(HAVE_RAWCTX)
-    ADD_TEST(amok-bandwidth-sg-32-raw          ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:raw              --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/amok   --cd ${CMAKE_BINARY_DIR}/examples/amok ${CMAKE_HOME_DIRECTORY}/examples/amok/bandwidth/bandwidth_sg_32.tesh)
-    ADD_TEST(amok-saturate-sg-32-raw           ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:raw              --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/amok   --cd ${CMAKE_BINARY_DIR}/examples/amok ${CMAKE_HOME_DIRECTORY}/examples/amok/saturate/saturate_sg_32.tesh)
+    ADD_TEST(tesh-msg-get-sender-raw            ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/msg/get_sender.tesh)
   endif(HAVE_RAWCTX)
   if(CONTEXT_UCONTEXT)
-       ADD_TEST(amok-bandwidth-sg-32-ucontext  ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/amok   --cd ${CMAKE_BINARY_DIR}/examples/amok ${CMAKE_HOME_DIRECTORY}/examples/amok/bandwidth/bandwidth_sg_32.tesh)
-       ADD_TEST(amok-saturate-sg-32-ucontext   ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/amok   --cd ${CMAKE_BINARY_DIR}/examples/amok ${CMAKE_HOME_DIRECTORY}/examples/amok/saturate/saturate_sg_32.tesh)
+    ADD_TEST(tesh-msg-get-sender-ucontext       ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/msg/get_sender.tesh)
   endif(CONTEXT_UCONTEXT)
-ELSE(${ARCH_32_BITS})
-  ADD_TEST(amok-bandwidth-sg-64-thread ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:thread           --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/amok   --cd ${CMAKE_BINARY_DIR}/examples/amok ${CMAKE_HOME_DIRECTORY}/examples/amok/bandwidth/bandwidth_sg_64.tesh)
-  ADD_TEST(amok-saturate-sg-64-thread  ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:thread           --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/amok   --cd ${CMAKE_BINARY_DIR}/examples/amok ${CMAKE_HOME_DIRECTORY}/examples/amok/saturate/saturate_sg_64.tesh)
+
+  IF(enable_debug) # these tests need the assertion mechanism
+    ADD_TEST(tesh-simdag-parser-bogus-symmetric ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms two_hosts_asymetric.tesh)
+  ENDIF(enable_debug)
+
+  ADD_TEST(tesh-simdag-bypass                   ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms --setenv srcdir=${CMAKE_HOME_DIRECTORY} --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms basic_parsing_test_bypass.tesh)
+  ADD_TEST(tesh-simdag-flatifier                ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms --setenv srcdir=${CMAKE_HOME_DIRECTORY} --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms flatifier.tesh)
+  ADD_TEST(tesh-simdag-link                     ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms --setenv srcdir=${CMAKE_HOME_DIRECTORY} --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms basic_link_test.tesh)
+
+  ADD_TEST(tesh-simdag-reinit-costs             ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/network/test_reinit_costs.tesh)
+  ADD_TEST(tesh-simdag-parser                   ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms basic_parsing_test.tesh)
+  ADD_TEST(tesh-simdag-parser-sym-full          ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms basic_parsing_test_sym_full.tesh)
+  ADD_TEST(tesh-simdag-full-links               ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms get_full_link.tesh)
+  ADD_TEST(tesh-simdag-basic0                   ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/basic0.tesh)
+  ADD_TEST(tesh-simdag-basic1                   ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/basic1.tesh)
+  ADD_TEST(tesh-simdag-basic2                   ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/basic2.tesh)
+  ADD_TEST(tesh-simdag-basic3                   ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/basic3.tesh)
+  ADD_TEST(tesh-simdag-basic4                   ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/basic4.tesh)
+  ADD_TEST(tesh-simdag-basic5                   ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/basic5.tesh)
+  ADD_TEST(tesh-simdag-basic6                   ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/basic6.tesh)
+  ADD_TEST(tesh-simdag-incomplete               ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/incomplete.tesh)
+  ADD_TEST(tesh-simdag-p2p-1                    ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/network/p2p/test_latency1.tesh)
+  ADD_TEST(tesh-simdag-p2p-2                    ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/network/p2p/test_latency2.tesh)
+  ADD_TEST(tesh-simdag-p2p-3                    ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/network/p2p/test_latency3.tesh)
+  ADD_TEST(tesh-simdag-p2p-4                    ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/network/p2p/test_latency_bound.tesh)
+  ADD_TEST(tesh-simdag-mxn-1                    ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/network/mxn/test_intra_all2all.tesh)
+  ADD_TEST(tesh-simdag-mxn-2                    ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/network/mxn/test_intra_independent_comm.tesh)
+  ADD_TEST(tesh-simdag-mxn-3                    ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/network/mxn/test_intra_scatter.tesh)
+  ADD_TEST(tesh-simdag-par-1                    ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/partask/test_comp_only_seq.tesh)
+  ADD_TEST(tesh-simdag-par-2                    ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/partask/test_comp_only_par.tesh)
+
+  # MSG examples
+  ADD_TEST(msg-file                             ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/ --setenv srcdir=${CMAKE_HOME_DIRECTORY}/ --cd ${CMAKE_HOME_DIRECTORY}/examples/ ${CMAKE_HOME_DIRECTORY}/examples/msg/io/io.tesh)
+  ADD_TEST(msg-start-kill-time                  ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/ --setenv srcdir=${CMAKE_HOME_DIRECTORY}/ --cd ${CMAKE_HOME_DIRECTORY}/examples/ ${CMAKE_HOME_DIRECTORY}/examples/msg/start_kill_time/start_kill_time.tesh)
+
+  ADD_TEST(msg-sendrecv-CLM03-thread            ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/sendrecv/sendrecv_CLM03.tesh)
+  ADD_TEST(msg-sendrecv-Vegas-thread            ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/sendrecv/sendrecv_Vegas.tesh)
+  ADD_TEST(msg-sendrecv-Reno-thread             ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/sendrecv/sendrecv_Reno.tesh)
+  ADD_TEST(msg-suspend-thread                   ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/suspend/suspend.tesh)
+  ADD_TEST(msg-masterslave-bypass-thread        ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_bypass.tesh)
+  ADD_TEST(msg-masterslave-kill-thread          ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_kill.tesh)
+  ADD_TEST(msg-masterslave-multicore-thread     ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_multicore.tesh)
+
+  ADD_TEST(msg-masterslave-no-crosstraffic-mailbox-thread       ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_mailbox.tesh)
+  ADD_TEST(msg-masterslave-no-crosstraffic-thread               ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave.tesh)
+  ADD_TEST(msg-masterslave-no-crosstraffic-forwarder-thread     ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_forwarder.tesh)
+  ADD_TEST(msg-masterslave-no-crosstraffic-failure-thread       ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_failure.tesh)
+
+  ADD_TEST(msg-masterslave-thread               ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_crosstraffic.tesh)
+  ADD_TEST(msg-masterslave-forwarder-thread     ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_forwarder_crosstraffic.tesh)
+  ADD_TEST(msg-masterslave-failure-thread       ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_failure_crosstraffic.tesh)
+  ADD_TEST(msg-masterslave-mailbox-thread       ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_mailbox_crosstraffic.tesh)
+  ADD_TEST(msg-masterslave-cpu-ti-thread        ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/masterslave --cd ${CMAKE_HOME_DIRECTORY}/examples/msg masterslave/masterslave_cpu_ti_crosstraffic.tesh)
+
+  ADD_TEST(msg-masterslave-virtual-machines     ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg --cd ${CMAKE_HOME_DIRECTORY}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/cloud/masterslave_virtual_machines.tesh)
+
+  if(CONTEXT_UCONTEXT)
+    ADD_TEST(msg-sendrecv-CLM03-ucontext        ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/sendrecv/sendrecv_CLM03.tesh)
+    ADD_TEST(msg-sendrecv-Vegas-ucontext        ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/sendrecv/sendrecv_Vegas.tesh)
+    ADD_TEST(msg-sendrecv-Reno-ucontext         ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/sendrecv/sendrecv_Reno.tesh)
+    ADD_TEST(msg-suspend-ucontext               ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/suspend/suspend.tesh)
+    ADD_TEST(msg-masterslave-bypass-ucontext    ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_bypass.tesh)
+    ADD_TEST(msg-masterslave-kill-ucontext      ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_kill.tesh)
+    ADD_TEST(msg-masterslave-multicore-ucontext ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_multicore.tesh)
+    ADD_TEST(msg-masterslave-no-crosstraffic-mailbox-ucontext   ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_mailbox.tesh)
+    ADD_TEST(msg-masterslave-no-crosstraffic-ucontext           ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave.tesh)
+    ADD_TEST(msg-masterslave-no-crosstraffic-forwarder-ucontext ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_forwarder.tesh)
+    ADD_TEST(msg-masterslave-no-crosstraffic-failure-ucontext   ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_failure.tesh)
+
+    ADD_TEST(msg-masterslave-ucontext           ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_crosstraffic.tesh)
+    ADD_TEST(msg-masterslave-forwarder-ucontext ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_forwarder_crosstraffic.tesh)
+    ADD_TEST(msg-masterslave-failure-ucontext   ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_failure_crosstraffic.tesh)
+    ADD_TEST(msg-masterslave-mailbox-ucontext   ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_mailbox_crosstraffic.tesh)
+    ADD_TEST(msg-masterslave-cpu-ti-ucontext    ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/masterslave --cd ${CMAKE_HOME_DIRECTORY}/examples/msg masterslave/masterslave_cpu_ti_crosstraffic.tesh)
+  endif(CONTEXT_UCONTEXT)
+
   if(HAVE_RAWCTX)
-    ADD_TEST(amok-bandwidth-sg-64-raw          ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:raw              --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/amok   --cd ${CMAKE_BINARY_DIR}/examples/amok ${CMAKE_HOME_DIRECTORY}/examples/amok/bandwidth/bandwidth_sg_64.tesh)
-    ADD_TEST(amok-saturate-sg-64-raw           ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:raw              --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/amok   --cd ${CMAKE_BINARY_DIR}/examples/amok ${CMAKE_HOME_DIRECTORY}/examples/amok/saturate/saturate_sg_64.tesh)
+    ADD_TEST(msg-sendrecv-CLM03-raw             ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/sendrecv/sendrecv_CLM03.tesh)
+    ADD_TEST(msg-sendrecv-Vegas-raw             ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/sendrecv/sendrecv_Vegas.tesh)
+    ADD_TEST(msg-sendrecv-Reno-raw              ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/sendrecv/sendrecv_Reno.tesh)
+    ADD_TEST(msg-suspend-raw                    ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/suspend/suspend.tesh)
+    ADD_TEST(msg-masterslave-bypass-raw         ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_bypass.tesh)
+    ADD_TEST(msg-masterslave-kill-raw           ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_kill.tesh)
+    ADD_TEST(msg-masterslave-multicore-raw      ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_multicore.tesh)
+    ADD_TEST(msg-masterslave-no-crosstraffic-mailbox-raw        ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_mailbox.tesh)
+    ADD_TEST(msg-masterslave-no-crosstraffic-raw                ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave.tesh)
+    ADD_TEST(msg-masterslave-no-crosstraffic-forwarder-raw      ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_forwarder.tesh)
+    ADD_TEST(msg-masterslave-no-crosstraffic-failure-raw        ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_failure.tesh)
+
+    ADD_TEST(msg-masterslave-raw                ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_crosstraffic.tesh)
+    ADD_TEST(msg-masterslave-forwarder-raw      ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_forwarder_crosstraffic.tesh)
+    ADD_TEST(msg-masterslave-failure-raw        ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_failure_crosstraffic.tesh)
+    ADD_TEST(msg-masterslave-mailbox-raw        ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_mailbox_crosstraffic.tesh)
+    ADD_TEST(msg-masterslave-cpu-ti-raw         ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/masterslave --cd ${CMAKE_HOME_DIRECTORY}/examples/msg masterslave/masterslave_cpu_ti_crosstraffic.tesh)
+  endif(HAVE_RAWCTX)
+
+  ADD_TEST(msg-masterslave-vivaldi-thread       ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_vivaldi.tesh)
+  ADD_TEST(msg-token-ring-thread                ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg/token_ring --cd ${CMAKE_BINARY_DIR}/examples/msg/token_ring ${CMAKE_HOME_DIRECTORY}/examples/msg/token_ring/token_ring.tesh)
+  if(HAVE_RAWCTX)
+    ADD_TEST(msg-masterslave-vivaldi-raw        ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_vivaldi.tesh)
+    ADD_TEST(msg-token-ring-raw                 ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg/token_ring --cd ${CMAKE_BINARY_DIR}/examples/msg/token_ring ${CMAKE_HOME_DIRECTORY}/examples/msg/token_ring/token_ring.tesh)
   endif(HAVE_RAWCTX)
   if(CONTEXT_UCONTEXT)
-         ADD_TEST(amok-saturate-sg-64-ucontext ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/amok   --cd ${CMAKE_BINARY_DIR}/examples/amok ${CMAKE_HOME_DIRECTORY}/examples/amok/saturate/saturate_sg_64.tesh)
-         ADD_TEST(amok-bandwidth-sg-64-ucontext        ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/amok   --cd ${CMAKE_BINARY_DIR}/examples/amok ${CMAKE_HOME_DIRECTORY}/examples/amok/bandwidth/bandwidth_sg_64.tesh)
+    ADD_TEST(msg-masterslave-vivaldi-ucontext   ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_vivaldi.tesh)
+    ADD_TEST(msg-token-ring-ucontext            ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg/token_ring --cd ${CMAKE_BINARY_DIR}/examples/msg/token_ring ${CMAKE_HOME_DIRECTORY}/examples/msg/token_ring/token_ring.tesh)
   endif(CONTEXT_UCONTEXT)
-ENDIF(${ARCH_32_BITS})
-
-# simdag examples
-ADD_TEST(simdag-test-dotload           ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/simdag/dot     --cd ${CMAKE_BINARY_DIR}/examples/simdag/dot ${CMAKE_HOME_DIRECTORY}/examples/simdag/dot/test_simdag_dotload.tesh)
-ADD_TEST(simdag-test-simdag            ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/simdag         --cd ${CMAKE_BINARY_DIR}/examples/simdag ${CMAKE_HOME_DIRECTORY}/examples/simdag/test_simdag.tesh)
-ADD_TEST(simdag-test-simdag2           ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/simdag         --cd ${CMAKE_BINARY_DIR}/examples/simdag ${CMAKE_HOME_DIRECTORY}/examples/simdag/test_simdag2.tesh)
-ADD_TEST(simdag-test-seq-access                ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/simdag         --cd ${CMAKE_BINARY_DIR}/examples/simdag ${CMAKE_HOME_DIRECTORY}/examples/simdag/test_simdag_seq_access.tesh)
-ADD_TEST(simdag-test-typed-tasks               ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/simdag         --cd ${CMAKE_BINARY_DIR}/examples/simdag ${CMAKE_HOME_DIRECTORY}/examples/simdag/test_simdag_typed_tasks.tesh)
-ADD_TEST(simdag-test-comm-throttling           ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/simdag         --cd ${CMAKE_BINARY_DIR}/examples/simdag ${CMAKE_HOME_DIRECTORY}/examples/simdag/test_simdag_comm_throttling.tesh)
-ADD_TEST(simdag-test-dax-cycle         ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/simdag/dax     --cd ${CMAKE_BINARY_DIR}/examples/simdag/dax ${CMAKE_HOME_DIRECTORY}/examples/simdag/dax/simple_dax_with_cycle.tesh)
-ADD_TEST(simdag-test-prop              ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/simdag         --cd ${CMAKE_BINARY_DIR}/examples/simdag ${CMAKE_HOME_DIRECTORY}/examples/simdag/properties/test_prop.tesh)
-ADD_TEST(simdag-test-minmin-scheduling         ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --setenv bindir=${CMAKE_BINARY_DIR}/examples/simdag/scheduling  --cd ${CMAKE_HOME_DIRECTORY}/examples/simdag/scheduling test_minmin.tesh)
-
-ADD_TEST(msg-gtnets-crosstraffic-thread   ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread       --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-crosstraffic.tesh)
-if(CONTEXT_UCONTEXT)
-  ADD_TEST(msg-gtnets-crosstraffic-ucontext ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext     --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-crosstraffic.tesh)
-endif(CONTEXT_UCONTEXT)
-if(HAVE_RAWCTX)
-  ADD_TEST(msg-gtnets-crosstraffic-raw      ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw      --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-crosstraffic.tesh)
-endif(HAVE_RAWCTX)
-
-if(HAVE_GTNETS)
-ADD_TEST(msg-gtnets-waxman-thread      ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:thread           --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-waxman.tesh)
-ADD_TEST(msg-gtnets-dogbone-thread     ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:thread           --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-dogbone-gtnets.tesh)
-ADD_TEST(msg-gtnets-onelink-thread     ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:thread           --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-onelink-gtnets.tesh)
-ADD_TEST(msg-gtnets-dogbone-lv08-thread        ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:thread           --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-dogbone-lv08.tesh)
-ADD_TEST(msg-gtnets-onelink-lv08-thread        ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:thread           --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-onelink-lv08.tesh)
-if(CONTEXT_UCONTEXT)
-       ADD_TEST(msg-gtnets-waxman-ucontext     ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-waxman.tesh)
-       ADD_TEST(msg-gtnets-dogbone-ucontext    ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-dogbone-gtnets.tesh)
-       ADD_TEST(msg-gtnets-onelink-ucontext    ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-onelink-gtnets.tesh)
-       ADD_TEST(msg-gtnets-dogbone-lv08-ucontext       ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-dogbone-lv08.tesh)
-       ADD_TEST(msg-gtnets-onelink-lv08-ucontext       ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-onelink-lv08.tesh)
-endif(CONTEXT_UCONTEXT)
-if(HAVE_RAWCTX)
-       ADD_TEST(msg-gtnets-waxman-raw          ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:raw              --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-waxman.tesh)
-       ADD_TEST(msg-gtnets-dogbone-raw         ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:raw              --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-dogbone-gtnets.tesh)
-       ADD_TEST(msg-gtnets-onelink-raw         ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:raw              --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-onelink-gtnets.tesh)
-       ADD_TEST(msg-gtnets-dogbone-lv08-raw            ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:raw              --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-dogbone-lv08.tesh)
-       ADD_TEST(msg-gtnets-onelink-lv08-raw            ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:raw              --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-onelink-lv08.tesh)
-endif(HAVE_RAWCTX)
-
-  if(HAVE_TRACING)
-  ADD_TEST(msg-tracing-gtnets-waxman                   ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg        --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/tracing-gtnets-waxman.tesh)
-  ADD_TEST(msg-tracing-gtnets-dogbone                  ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg        --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/tracing-gtnets-dogbone-gtnets.tesh)
-  ADD_TEST(msg-tracing-gtnets-onelink                  ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg        --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/tracing-gtnets-onelink-gtnets.tesh)
-  ADD_TEST(msg-tracing-gtnets-dogbone-lv08             ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg        --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/tracing-gtnets-dogbone-lv08.tesh)
-  ADD_TEST(msg-tracing-gtnets-onelink-lv08             ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg        --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/tracing-gtnets-onelink-lv08.tesh)
-  endif(HAVE_TRACING)
-endif(HAVE_GTNETS)
-
-if(HAVE_NS3)
-ADD_TEST(msg-ns3-thread            ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread           --setenv srcdir=${CMAKE_HOME_DIRECTORY} --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/ns3/ns3.tesh)
-ADD_TEST(msg-ns3-ucontext      ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY} --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/ns3/ns3.tesh)
-ADD_TEST(msg-ns3-raw        ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}        --cfg contexts/factory:raw              --setenv srcdir=${CMAKE_HOME_DIRECTORY} --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/ns3/ns3.tesh)
-endif(HAVE_NS3)
-
-IF(HAVE_TRACING)
-  ADD_TEST(tracing-help             ${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms/basic_parsing_test --help-tracing)
-  ADD_TEST(tracing-ms                          ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg        --cd ${CMAKE_HOME_DIRECTORY}/examples/msg tracing/ms.tesh)
-  ADD_TEST(tracing-trace_platform                              ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg        --cd ${CMAKE_HOME_DIRECTORY}/examples/msg tracing/trace_platform.tesh)
-  ADD_TEST(tracing-user_variables                              ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg        --cd ${CMAKE_HOME_DIRECTORY}/examples/msg tracing/user_variables.tesh)
-  ADD_TEST(tracing-link_user_variables                                 ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg        --cd ${CMAKE_HOME_DIRECTORY}/examples/msg tracing/link_user_variables.tesh)
-  ADD_TEST(tracing-link_srcdst_user_variables                          ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg        --cd ${CMAKE_HOME_DIRECTORY}/examples/msg tracing/link_srcdst_user_variables.tesh)
-  ADD_TEST(tracing-categories          ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg        --cd ${CMAKE_HOME_DIRECTORY}/examples/msg tracing/categories.tesh)
-  ADD_TEST(tracing-process-migration ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}       --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg        --cd ${CMAKE_HOME_DIRECTORY}/examples/msg tracing/procmig.tesh)
-  ADD_TEST(graphicator ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} --setenv bindir=${CMAKE_BINARY_DIR}/bin --cd ${CMAKE_HOME_DIRECTORY}/tools/graphicator graphicator.tesh)
-ENDIF(HAVE_TRACING)
-
-# Lua examples
-if(HAVE_LUA)
-ADD_TEST(lua-duplicated-globals                                ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd ${CMAKE_HOME_DIRECTORY}/examples/lua/state_cloner duplicated_globals.tesh)
-ADD_TEST(lua-masterslave                               ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd ${CMAKE_HOME_DIRECTORY}/examples/lua/masterslave master_slave.tesh)
-ADD_TEST(lua-mult-matrix                               ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd ${CMAKE_HOME_DIRECTORY}/examples/lua/multi_matrix mult_matrix.tesh)
-ADD_TEST(lua-masterslave-bypass                ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd ${CMAKE_HOME_DIRECTORY}/examples/lua/console master_slave_bypass.tesh)
-ADD_TEST(lua-msg-masterslave-console   ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd ${CMAKE_BINARY_DIR}/examples/msg/masterslave --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave  ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_console.tesh)
-ADD_TEST(lua-chord                             ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd ${CMAKE_HOME_DIRECTORY}/examples/lua/chord chord.tesh)
-ADD_TEST(simdag-test-lua                       ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd ${CMAKE_HOME_DIRECTORY}/examples/simdag test_simdag2_lua.tesh)
-set_tests_properties(lua-duplicated-globals                            PROPERTIES ENVIRONMENT "LUA_CPATH=${CMAKE_BINARY_DIR}/examples/lua/?.so")
-set_tests_properties(lua-masterslave                           PROPERTIES ENVIRONMENT "LUA_CPATH=${CMAKE_BINARY_DIR}/examples/lua/?.so")
-set_tests_properties(lua-mult-matrix                           PROPERTIES ENVIRONMENT "LUA_CPATH=${CMAKE_BINARY_DIR}/examples/lua/?.so")
-set_tests_properties(lua-masterslave-bypass            PROPERTIES ENVIRONMENT "LUA_CPATH=${CMAKE_BINARY_DIR}/examples/lua/?.so")
-set_tests_properties(lua-msg-masterslave-console       PROPERTIES ENVIRONMENT "LUA_CPATH=${CMAKE_BINARY_DIR}/examples/lua/?.so")
-set_tests_properties(lua-chord                                 PROPERTIES ENVIRONMENT "LUA_CPATH=${CMAKE_BINARY_DIR}/examples/lua/?.so")
-set_tests_properties(simdag-test-lua                   PROPERTIES ENVIRONMENT "LUA_CPATH=${CMAKE_BINARY_DIR}/examples/lua/?.so")
-endif(HAVE_LUA)
-
-# END TESH TESTS
-
-if(enable_smpi)
-# smpi examples
-ADD_TEST(smpi-bcast-thread     ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:thread                   --cd ${CMAKE_BINARY_DIR}/examples/smpi ${CMAKE_HOME_DIRECTORY}/examples/smpi/bcast.tesh)
-ADD_TEST(smpi-reduce-thread    ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:thread                   --cd ${CMAKE_BINARY_DIR}/examples/smpi ${CMAKE_HOME_DIRECTORY}/examples/smpi/reduce.tesh)
-if(HAVE_RAWCTX)
-  ADD_TEST(smpi-bcast-raw              ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:raw                      --cd ${CMAKE_BINARY_DIR}/examples/smpi ${CMAKE_HOME_DIRECTORY}/examples/smpi/bcast.tesh)
-  ADD_TEST(smpi-reduce-raw             ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:raw                      --cd ${CMAKE_BINARY_DIR}/examples/smpi ${CMAKE_HOME_DIRECTORY}/examples/smpi/reduce.tesh)
-endif(HAVE_RAWCTX)
-if(CONTEXT_UCONTEXT)
-       ADD_TEST(smpi-bcast-ucontext    ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext                 --cd ${CMAKE_BINARY_DIR}/examples/smpi ${CMAKE_HOME_DIRECTORY}/examples/smpi/bcast.tesh)
-       ADD_TEST(smpi-reduce-ucontext   ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext                 --cd ${CMAKE_BINARY_DIR}/examples/smpi ${CMAKE_HOME_DIRECTORY}/examples/smpi/reduce.tesh)
-endif(CONTEXT_UCONTEXT)
-if(HAVE_TRACING)
-  ADD_TEST(smpi-tracing-ptp ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd ${CMAKE_BINARY_DIR}/examples/smpi ${CMAKE_HOME_DIRECTORY}/examples/smpi/tracing/smpi_traced.tesh)
-endif(HAVE_TRACING)
-endif(enable_smpi)
-                                                               
-# examples/msg/mc
-if(HAVE_MC)
-ADD_TEST(mc-bugged1-thread     ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:thread           --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/mc     --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/mc bugged1.tesh)
-ADD_TEST(mc-bugged2-thread     ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:thread           --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/mc     --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/mc bugged2.tesh)
-ADD_TEST(mc-centralized-thread ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:thread           --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/mc     --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/mc centralized.tesh)
-if(CONTEXT_UCONTEXT)
-       ADD_TEST(mc-bugged1-ucontext    ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/mc     --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/mc bugged1.tesh)
-       ADD_TEST(mc-bugged2-ucontext    ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/mc     --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/mc bugged2.tesh)
-       ADD_TEST(mc-centralized-ucontext        ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/mc     --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/mc centralized.tesh)
-endif(CONTEXT_UCONTEXT)
-if(HAVE_RAWCTX)
-  ADD_TEST(mc-bugged1-raw              ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:raw              --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/mc     --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/mc bugged1.tesh)
-  ADD_TEST(mc-bugged2-raw              ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:raw              --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/mc     --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/mc bugged2.tesh)
-  ADD_TEST(mc-centralized-raw          ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:raw              --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/mc     --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/mc centralized.tesh)
-endif(HAVE_RAWCTX)
-endif(HAVE_MC)
-
-
-###
-### Declare that we know that some tests are broken
-###
-
-# Amok is broken in RL since before v3.3 (should fix it one day)
-set_tests_properties(amok-bandwidth-rl amok-saturate-rl PROPERTIES WILL_FAIL true)
-if(${ARCH_32_BITS})
-  set_tests_properties(amok-bandwidth-sg-32-thread PROPERTIES WILL_FAIL true)   
-  set_tests_properties(amok-saturate-sg-32-thread  PROPERTIES WILL_FAIL true)
+
+  ADD_TEST(msg-migration-thread                 ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/migration/migration.tesh)
+  ADD_TEST(msg-ptask-thread                     ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/parallel_task/parallel_task.tesh)
+  ADD_TEST(msg-priority-thread                  ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/priority/priority.tesh)
+  ADD_TEST(msg-properties-thread                ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/properties/msg_prop.tesh)
+  ADD_TEST(msg-icomms-thread                    ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg/icomms --cd ${CMAKE_BINARY_DIR}/examples/msg/icomms ${CMAKE_HOME_DIRECTORY}/examples/msg/icomms/peer.tesh)
+  ADD_TEST(msg-actions-thread                   ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/actions --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/actions actions.tesh)
+  ADD_TEST(msg-trace-thread                     ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/msg --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/msg trace/trace.tesh)
+  ADD_TEST(msg-chord-no-crosstraffic-thread     ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/chord --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/chord chord.tesh)
+  ADD_TEST(msg-chord-no-crosstraffic-thread-parallel ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --cfg contexts/nthreads:4 --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/chord --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/chord chord.tesh)
+  ADD_TEST(msg-chord-thread                     ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/chord --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/chord chord_crosstraffic.tesh)
+  ADD_TEST(msg-chord-thread-parallel            ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --cfg contexts/nthreads:4 --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/chord --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/chord chord_crosstraffic.tesh)
   if(CONTEXT_UCONTEXT)
-       set_tests_properties(amok-bandwidth-sg-32-ucontext amok-saturate-sg-32-ucontext PROPERTIES WILL_FAIL true) 
+    ADD_TEST(msg-migration-ucontext             ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/migration/migration.tesh)
+    ADD_TEST(msg-ptask-ucontext                 ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/parallel_task/parallel_task.tesh)
+    ADD_TEST(msg-priority-ucontext              ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/priority/priority.tesh)
+    ADD_TEST(msg-properties-ucontext            ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/properties/msg_prop.tesh)
+    ADD_TEST(msg-icomms-ucontext                ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg/icomms --cd ${CMAKE_BINARY_DIR}/examples/msg/icomms ${CMAKE_HOME_DIRECTORY}/examples/msg/icomms/peer.tesh)
+    ADD_TEST(msg-actions-ucontext               ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/actions --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/actions actions.tesh)
+    ADD_TEST(msg-trace-ucontext                 ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/msg --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/msg trace/trace.tesh)
+    ADD_TEST(msg-chord-no-crosstraffic-ucontext ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/chord --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/chord chord.tesh)
+    ADD_TEST(msg-chord-no-crosstraffic-ucontext-parallel ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --cfg contexts/nthreads:4 --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/chord --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/chord chord.tesh)
+    ADD_TEST(msg-chord-ucontext                 ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/chord --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/chord chord_crosstraffic.tesh)
+    ADD_TEST(msg-chord-ucontext-parallel        ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --cfg contexts/nthreads:4 --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/chord --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/chord chord_crosstraffic.tesh)
   endif(CONTEXT_UCONTEXT)
   if(HAVE_RAWCTX)
-    set_tests_properties(amok-bandwidth-sg-32-raw amok-saturate-sg-32-raw PROPERTIES WILL_FAIL true)   
-  endif(HAVE_RAWCTX)   
-else(${ARCH_32_BITS})
-  set_tests_properties(amok-bandwidth-sg-64-thread PROPERTIES WILL_FAIL true)   
-  set_tests_properties(amok-saturate-sg-64-thread PROPERTIES WILL_FAIL true)  
+    ADD_TEST(msg-migration-raw                  ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/migration/migration.tesh)
+    ADD_TEST(msg-ptask-raw                      ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/parallel_task/parallel_task.tesh)
+    ADD_TEST(msg-priority-raw                   ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/priority/priority.tesh)
+    ADD_TEST(msg-actions-raw                    ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/actions --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/actions actions.tesh)
+    ADD_TEST(msg-icomms-raw                     ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg/icomms --cd ${CMAKE_BINARY_DIR}/examples/msg/icomms ${CMAKE_HOME_DIRECTORY}/examples/msg/icomms/peer.tesh)
+    ADD_TEST(msg-properties-raw                 ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/properties/msg_prop.tesh)
+    ADD_TEST(msg-trace-raw                      ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/msg --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/msg trace/trace.tesh)
+    ADD_TEST(msg-chord-no-crosstraffic-raw      ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/chord --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/chord chord.tesh)
+    ADD_TEST(msg-chord-no-crosstraffic-raw-parallel ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --cfg contexts/nthreads:4 --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/chord --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/chord chord.tesh)
+    ADD_TEST(msg-chord-raw                      ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/chord --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/chord chord_crosstraffic.tesh)
+    ADD_TEST(msg-chord-raw-parallel             ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --cfg contexts/nthreads:4 --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/chord --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/chord chord_crosstraffic.tesh)
+  endif(HAVE_RAWCTX)
+
+  IF(${ARCH_32_BITS})
+    ADD_TEST(gras-ping-sg-32-thread             ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/ping --cd ${CMAKE_BINARY_DIR}/examples/gras/ping ${CMAKE_HOME_DIRECTORY}/examples/gras/ping/test_sg_32.tesh)
+    ADD_TEST(gras-rpc-sg-32-thread              ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/rpc --cd ${CMAKE_BINARY_DIR}/examples/gras/rpc ${CMAKE_HOME_DIRECTORY}/examples/gras/rpc/test_sg_32.tesh)
+    ADD_TEST(gras-spawn-sg-32-thread            ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/spawn --cd ${CMAKE_BINARY_DIR}/examples/gras/spawn ${CMAKE_HOME_DIRECTORY}/examples/gras/spawn/test_sg_32.tesh)
+    ADD_TEST(gras-timer-sg-32-thread            ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/timer --cd ${CMAKE_BINARY_DIR}/examples/gras/timer ${CMAKE_HOME_DIRECTORY}/examples/gras/timer/test_sg_32.tesh)
+    ADD_TEST(gras-chrono-sg-32-thread           ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/chrono --cd ${CMAKE_BINARY_DIR}/examples/gras/chrono ${CMAKE_HOME_DIRECTORY}/examples/gras/chrono/test_sg_32.tesh)
+    ADD_TEST(gras-simple-token-sg-32-thread     ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/mutual_exclusion/simple_token --cd ${CMAKE_BINARY_DIR}/examples/gras/mutual_exclusion/simple_token ${CMAKE_HOME_DIRECTORY}/examples/gras/mutual_exclusion/simple_token/test_sg_32.tesh)
+    ADD_TEST(gras-mmrpc-sg-32-thread            ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/mmrpc --cd ${CMAKE_BINARY_DIR}/examples/gras/mmrpc ${CMAKE_HOME_DIRECTORY}/examples/gras/mmrpc/test_sg_32.tesh)
+    ADD_TEST(gras-all2all-sg-32-thread          ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/all2all --cd ${CMAKE_BINARY_DIR}/examples/gras/all2all ${CMAKE_HOME_DIRECTORY}/examples/gras/all2all/test_sg_32.tesh)
+    ADD_TEST(gras-pmm-sg-32-thread              ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/pmm --cd ${CMAKE_BINARY_DIR}/examples/gras/pmm ${CMAKE_HOME_DIRECTORY}/examples/gras/pmm/test_sg_32.tesh)
+    ADD_TEST(gras-synchro-sg-32-thread          ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/synchro --cd ${CMAKE_BINARY_DIR}/examples/gras/synchro ${CMAKE_HOME_DIRECTORY}/examples/gras/synchro/test_sg_32.tesh)
+    if(CONTEXT_UCONTEXT)
+      ADD_TEST(gras-ping-sg-32-ucontext         ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/ping --cd ${CMAKE_BINARY_DIR}/examples/gras/ping ${CMAKE_HOME_DIRECTORY}/examples/gras/ping/test_sg_32.tesh)
+      ADD_TEST(gras-rpc-sg-32-ucontext          ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/rpc --cd ${CMAKE_BINARY_DIR}/examples/gras/rpc ${CMAKE_HOME_DIRECTORY}/examples/gras/rpc/test_sg_32.tesh)
+      ADD_TEST(gras-spawn-sg-32-ucontext        ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/spawn --cd ${CMAKE_BINARY_DIR}/examples/gras/spawn ${CMAKE_HOME_DIRECTORY}/examples/gras/spawn/test_sg_32.tesh)
+      ADD_TEST(gras-timer-sg-32-ucontext        ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/timer --cd ${CMAKE_BINARY_DIR}/examples/gras/timer ${CMAKE_HOME_DIRECTORY}/examples/gras/timer/test_sg_32.tesh)
+      ADD_TEST(gras-chrono-sg-32-ucontext       ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/chrono --cd ${CMAKE_BINARY_DIR}/examples/gras/chrono ${CMAKE_HOME_DIRECTORY}/examples/gras/chrono/test_sg_32.tesh)
+      ADD_TEST(gras-simple-token-sg-32-ucontext ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/mutual_exclusion/simple_token --cd ${CMAKE_BINARY_DIR}/examples/gras/mutual_exclusion/simple_token ${CMAKE_HOME_DIRECTORY}/examples/gras/mutual_exclusion/simple_token/test_sg_32.tesh)
+      ADD_TEST(gras-mmrpc-sg-32-ucontext        ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/mmrpc --cd ${CMAKE_BINARY_DIR}/examples/gras/mmrpc ${CMAKE_HOME_DIRECTORY}/examples/gras/mmrpc/test_sg_32.tesh)
+      ADD_TEST(gras-all2all-sg-32-ucontext      ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/all2all --cd ${CMAKE_BINARY_DIR}/examples/gras/all2all ${CMAKE_HOME_DIRECTORY}/examples/gras/all2all/test_sg_32.tesh)
+      ADD_TEST(gras-pmm-sg-32-ucontext          ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/pmm --cd ${CMAKE_BINARY_DIR}/examples/gras/pmm ${CMAKE_HOME_DIRECTORY}/examples/gras/pmm/test_sg_32.tesh)
+      ADD_TEST(gras-synchro-sg-32-ucontext      ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/synchro --cd ${CMAKE_BINARY_DIR}/examples/gras/synchro ${CMAKE_HOME_DIRECTORY}/examples/gras/synchro/test_sg_32.tesh)
+    endif(CONTEXT_UCONTEXT)
+    if(HAVE_RAWCTX)
+      ADD_TEST(gras-ping-sg-32-raw              ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/ping --cd ${CMAKE_BINARY_DIR}/examples/gras/ping ${CMAKE_HOME_DIRECTORY}/examples/gras/ping/test_sg_32.tesh)
+      ADD_TEST(gras-rpc-sg-32-raw               ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/rpc --cd ${CMAKE_BINARY_DIR}/examples/gras/rpc ${CMAKE_HOME_DIRECTORY}/examples/gras/rpc/test_sg_32.tesh)
+      ADD_TEST(gras-spawn-sg-32-raw             ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/spawn --cd ${CMAKE_BINARY_DIR}/examples/gras/spawn ${CMAKE_HOME_DIRECTORY}/examples/gras/spawn/test_sg_32.tesh)
+      ADD_TEST(gras-timer-sg-32-raw             ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/timer --cd ${CMAKE_BINARY_DIR}/examples/gras/timer ${CMAKE_HOME_DIRECTORY}/examples/gras/timer/test_sg_32.tesh)
+      ADD_TEST(gras-chrono-sg-32-raw            ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/chrono --cd ${CMAKE_BINARY_DIR}/examples/gras/chrono ${CMAKE_HOME_DIRECTORY}/examples/gras/chrono/test_sg_32.tesh)
+      ADD_TEST(gras-simple-token-sg-32-raw      ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/mutual_exclusion/simple_token --cd ${CMAKE_BINARY_DIR}/examples/gras/mutual_exclusion/simple_token ${CMAKE_HOME_DIRECTORY}/examples/gras/mutual_exclusion/simple_token/test_sg_32.tesh)
+      ADD_TEST(gras-mmrpc-sg-32-raw             ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/mmrpc --cd ${CMAKE_BINARY_DIR}/examples/gras/mmrpc ${CMAKE_HOME_DIRECTORY}/examples/gras/mmrpc/test_sg_32.tesh)
+      ADD_TEST(gras-all2all-sg-32-raw           ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/all2all --cd ${CMAKE_BINARY_DIR}/examples/gras/all2all ${CMAKE_HOME_DIRECTORY}/examples/gras/all2all/test_sg_32.tesh)
+      ADD_TEST(gras-pmm-sg-32-raw               ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/pmm --cd ${CMAKE_BINARY_DIR}/examples/gras/pmm ${CMAKE_HOME_DIRECTORY}/examples/gras/pmm/test_sg_32.tesh)
+      ADD_TEST(gras-synchro-sg-32-raw           ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/synchro --cd ${CMAKE_BINARY_DIR}/examples/gras/synchro ${CMAKE_HOME_DIRECTORY}/examples/gras/synchro/test_sg_32.tesh)
+    endif(HAVE_RAWCTX)
+
+  ELSE(${ARCH_32_BITS})
+    ADD_TEST(gras-ping-sg-64-thread             ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/ping --cd ${CMAKE_BINARY_DIR}/examples/gras/ping ${CMAKE_HOME_DIRECTORY}/examples/gras/ping/test_sg_64.tesh)
+    ADD_TEST(gras-rpc-sg-64-thread              ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/rpc --cd ${CMAKE_BINARY_DIR}/examples/gras/rpc ${CMAKE_HOME_DIRECTORY}/examples/gras/rpc/test_sg_64.tesh)
+    ADD_TEST(gras-spawn-sg-64-thread            ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/spawn --cd ${CMAKE_BINARY_DIR}/examples/gras/spawn ${CMAKE_HOME_DIRECTORY}/examples/gras/spawn/test_sg_64.tesh)
+    ADD_TEST(gras-timer-sg-64-thread            ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/timer --cd ${CMAKE_BINARY_DIR}/examples/gras/timer ${CMAKE_HOME_DIRECTORY}/examples/gras/timer/test_sg_64.tesh)
+    ADD_TEST(gras-chrono-sg-64-thread           ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/chrono --cd ${CMAKE_BINARY_DIR}/examples/gras/chrono ${CMAKE_HOME_DIRECTORY}/examples/gras/chrono/test_sg_64.tesh)
+    ADD_TEST(gras-simple-token-sg-64-thread     ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/mutual_exclusion/simple_token --cd ${CMAKE_BINARY_DIR}/examples/gras/mutual_exclusion/simple_token ${CMAKE_HOME_DIRECTORY}/examples/gras/mutual_exclusion/simple_token/test_sg_64.tesh)
+    ADD_TEST(gras-mmrpc-sg-64-thread            ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/mmrpc --cd ${CMAKE_BINARY_DIR}/examples/gras/mmrpc ${CMAKE_HOME_DIRECTORY}/examples/gras/mmrpc/test_sg_64.tesh)
+    ADD_TEST(gras-all2all-sg-64-thread          ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/all2all --cd ${CMAKE_BINARY_DIR}/examples/gras/all2all ${CMAKE_HOME_DIRECTORY}/examples/gras/all2all/test_sg_64.tesh)
+    ADD_TEST(gras-pmm-sg-64-thread              ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/pmm --cd ${CMAKE_BINARY_DIR}/examples/gras/pmm ${CMAKE_HOME_DIRECTORY}/examples/gras/pmm/test_sg_64.tesh)
+    ADD_TEST(gras-synchro-sg-64-thread          ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/synchro --cd ${CMAKE_BINARY_DIR}/examples/gras/synchro ${CMAKE_HOME_DIRECTORY}/examples/gras/synchro/test_sg_64.tesh)
+    if(CONTEXT_UCONTEXT)
+      ADD_TEST(gras-ping-sg-64-ucontext         ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/ping --cd ${CMAKE_BINARY_DIR}/examples/gras/ping ${CMAKE_HOME_DIRECTORY}/examples/gras/ping/test_sg_64.tesh)
+      ADD_TEST(gras-rpc-sg-64-ucontext          ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/rpc --cd ${CMAKE_BINARY_DIR}/examples/gras/rpc ${CMAKE_HOME_DIRECTORY}/examples/gras/rpc/test_sg_64.tesh)
+      ADD_TEST(gras-spawn-sg-64-ucontext        ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/spawn --cd ${CMAKE_BINARY_DIR}/examples/gras/spawn ${CMAKE_HOME_DIRECTORY}/examples/gras/spawn/test_sg_64.tesh)
+      ADD_TEST(gras-timer-sg-64-ucontext        ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/timer --cd ${CMAKE_BINARY_DIR}/examples/gras/timer ${CMAKE_HOME_DIRECTORY}/examples/gras/timer/test_sg_64.tesh)
+      ADD_TEST(gras-chrono-sg-64-ucontext       ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/chrono --cd ${CMAKE_BINARY_DIR}/examples/gras/chrono ${CMAKE_HOME_DIRECTORY}/examples/gras/chrono/test_sg_64.tesh)
+      ADD_TEST(gras-simple-token-sg-64-ucontext ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/mutual_exclusion/simple_token --cd ${CMAKE_BINARY_DIR}/examples/gras/mutual_exclusion/simple_token ${CMAKE_HOME_DIRECTORY}/examples/gras/mutual_exclusion/simple_token/test_sg_64.tesh)
+      ADD_TEST(gras-mmrpc-sg-64-ucontext        ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/mmrpc --cd ${CMAKE_BINARY_DIR}/examples/gras/mmrpc ${CMAKE_HOME_DIRECTORY}/examples/gras/mmrpc/test_sg_64.tesh)
+      ADD_TEST(gras-all2all-sg-64-ucontext      ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/all2all --cd ${CMAKE_BINARY_DIR}/examples/gras/all2all ${CMAKE_HOME_DIRECTORY}/examples/gras/all2all/test_sg_64.tesh)
+      ADD_TEST(gras-pmm-sg-64-ucontext          ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/pmm --cd ${CMAKE_BINARY_DIR}/examples/gras/pmm ${CMAKE_HOME_DIRECTORY}/examples/gras/pmm/test_sg_64.tesh)
+      ADD_TEST(gras-synchro-sg-64-ucontext      ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/synchro --cd ${CMAKE_BINARY_DIR}/examples/gras/synchro ${CMAKE_HOME_DIRECTORY}/examples/gras/synchro/test_sg_64.tesh)
+    endif(CONTEXT_UCONTEXT)
+    if(HAVE_RAWCTX)
+      ADD_TEST(gras-ping-sg-64-raw              ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/ping --cd ${CMAKE_BINARY_DIR}/examples/gras/ping ${CMAKE_HOME_DIRECTORY}/examples/gras/ping/test_sg_64.tesh)
+      ADD_TEST(gras-rpc-sg-64-raw               ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/rpc --cd ${CMAKE_BINARY_DIR}/examples/gras/rpc ${CMAKE_HOME_DIRECTORY}/examples/gras/rpc/test_sg_64.tesh)
+      ADD_TEST(gras-spawn-sg-64-raw             ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/spawn --cd ${CMAKE_BINARY_DIR}/examples/gras/spawn ${CMAKE_HOME_DIRECTORY}/examples/gras/spawn/test_sg_64.tesh)
+      ADD_TEST(gras-timer-sg-64-raw             ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/timer --cd ${CMAKE_BINARY_DIR}/examples/gras/timer ${CMAKE_HOME_DIRECTORY}/examples/gras/timer/test_sg_64.tesh)
+      ADD_TEST(gras-chrono-sg-64-raw            ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/chrono --cd ${CMAKE_BINARY_DIR}/examples/gras/chrono ${CMAKE_HOME_DIRECTORY}/examples/gras/chrono/test_sg_64.tesh)
+      ADD_TEST(gras-simple-token-sg-64-raw      ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/mutual_exclusion/simple_token --cd ${CMAKE_BINARY_DIR}/examples/gras/mutual_exclusion/simple_token ${CMAKE_HOME_DIRECTORY}/examples/gras/mutual_exclusion/simple_token/test_sg_64.tesh)
+      ADD_TEST(gras-mmrpc-sg-64-raw             ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/mmrpc --cd ${CMAKE_BINARY_DIR}/examples/gras/mmrpc ${CMAKE_HOME_DIRECTORY}/examples/gras/mmrpc/test_sg_64.tesh)
+      ADD_TEST(gras-all2all-sg-64-raw           ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/all2all --cd ${CMAKE_BINARY_DIR}/examples/gras/all2all ${CMAKE_HOME_DIRECTORY}/examples/gras/all2all/test_sg_64.tesh)
+      ADD_TEST(gras-pmm-sg-64-raw               ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/pmm --cd ${CMAKE_BINARY_DIR}/examples/gras/pmm ${CMAKE_HOME_DIRECTORY}/examples/gras/pmm/test_sg_64.tesh)
+      ADD_TEST(gras-synchro-sg-64-raw           ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/synchro --cd ${CMAKE_BINARY_DIR}/examples/gras/synchro ${CMAKE_HOME_DIRECTORY}/examples/gras/synchro/test_sg_64.tesh)
+    endif(HAVE_RAWCTX)
+
+  ENDIF(${ARCH_32_BITS})
+  ADD_TEST(gras-properties-sg-thread            ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/properties --cd ${CMAKE_BINARY_DIR}/examples/gras/properties ${CMAKE_HOME_DIRECTORY}/examples/gras/properties/test_sg.tesh)
   if(CONTEXT_UCONTEXT)
-       set_tests_properties(amok-bandwidth-sg-64-ucontext amok-saturate-sg-64-ucontext PROPERTIES WILL_FAIL true) 
+    ADD_TEST(gras-properties-sg-ucontext        ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/properties --cd ${CMAKE_BINARY_DIR}/examples/gras/properties ${CMAKE_HOME_DIRECTORY}/examples/gras/properties/test_sg.tesh)
   endif(CONTEXT_UCONTEXT)
   if(HAVE_RAWCTX)
-    set_tests_properties(amok-bandwidth-sg-64-raw amok-saturate-sg-64-raw PROPERTIES WILL_FAIL true)   
-  endif(HAVE_RAWCTX)   
-endif(${ARCH_32_BITS})
-
-# Those tests are broken : set to "fail" for release v3.6
-if(release)
-if(HAVE_MC)
-       set_tests_properties(mc-bugged1-thread PROPERTIES WILL_FAIL true)
-       set_tests_properties(mc-bugged2-thread PROPERTIES WILL_FAIL true)
-       set_tests_properties(mc-centralized-thread PROPERTIES WILL_FAIL true)
-       if(CONTEXT_UCONTEXT)
-           set_tests_properties(mc-centralized-ucontext PROPERTIES WILL_FAIL true)
+    ADD_TEST(gras-properties-sg-raw             ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/properties --cd ${CMAKE_BINARY_DIR}/examples/gras/properties ${CMAKE_HOME_DIRECTORY}/examples/gras/properties/test_sg.tesh)
+  endif(HAVE_RAWCTX)
+
+  # amok examples
+  ADD_TEST(amok-bandwidth-rl                    ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd ${CMAKE_BINARY_DIR}/examples/amok ${CMAKE_HOME_DIRECTORY}/examples/amok/bandwidth/bandwidth_rl.tesh)
+  ADD_TEST(amok-saturate-rl                     ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd ${CMAKE_BINARY_DIR}/examples/amok ${CMAKE_HOME_DIRECTORY}/examples/amok/saturate/saturate_rl.tesh)
+
+  IF(${ARCH_32_BITS})
+    ADD_TEST(amok-bandwidth-sg-32-thread        ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/amok --cd ${CMAKE_BINARY_DIR}/examples/amok ${CMAKE_HOME_DIRECTORY}/examples/amok/bandwidth/bandwidth_sg_32.tesh)
+    ADD_TEST(amok-saturate-sg-32-thread         ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/amok --cd ${CMAKE_BINARY_DIR}/examples/amok ${CMAKE_HOME_DIRECTORY}/examples/amok/saturate/saturate_sg_32.tesh)
+    if(HAVE_RAWCTX)
+      ADD_TEST(amok-bandwidth-sg-32-raw         ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/amok --cd ${CMAKE_BINARY_DIR}/examples/amok ${CMAKE_HOME_DIRECTORY}/examples/amok/bandwidth/bandwidth_sg_32.tesh)
+      ADD_TEST(amok-saturate-sg-32-raw          ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/amok --cd ${CMAKE_BINARY_DIR}/examples/amok ${CMAKE_HOME_DIRECTORY}/examples/amok/saturate/saturate_sg_32.tesh)
+    endif(HAVE_RAWCTX)
+    if(CONTEXT_UCONTEXT)
+      ADD_TEST(amok-bandwidth-sg-32-ucontext    ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/amok --cd ${CMAKE_BINARY_DIR}/examples/amok ${CMAKE_HOME_DIRECTORY}/examples/amok/bandwidth/bandwidth_sg_32.tesh)
+      ADD_TEST(amok-saturate-sg-32-ucontext     ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/amok --cd ${CMAKE_BINARY_DIR}/examples/amok ${CMAKE_HOME_DIRECTORY}/examples/amok/saturate/saturate_sg_32.tesh)
+    endif(CONTEXT_UCONTEXT)
+  ELSE(${ARCH_32_BITS})
+    ADD_TEST(amok-bandwidth-sg-64-thread        ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/amok --cd ${CMAKE_BINARY_DIR}/examples/amok ${CMAKE_HOME_DIRECTORY}/examples/amok/bandwidth/bandwidth_sg_64.tesh)
+    ADD_TEST(amok-saturate-sg-64-thread         ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/amok --cd ${CMAKE_BINARY_DIR}/examples/amok ${CMAKE_HOME_DIRECTORY}/examples/amok/saturate/saturate_sg_64.tesh)
+    if(HAVE_RAWCTX)
+      ADD_TEST(amok-bandwidth-sg-64-raw         ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/amok --cd ${CMAKE_BINARY_DIR}/examples/amok ${CMAKE_HOME_DIRECTORY}/examples/amok/bandwidth/bandwidth_sg_64.tesh)
+      ADD_TEST(amok-saturate-sg-64-raw          ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/amok --cd ${CMAKE_BINARY_DIR}/examples/amok ${CMAKE_HOME_DIRECTORY}/examples/amok/saturate/saturate_sg_64.tesh)
+    endif(HAVE_RAWCTX)
+    if(CONTEXT_UCONTEXT)
+      ADD_TEST(amok-saturate-sg-64-ucontext     ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/amok --cd ${CMAKE_BINARY_DIR}/examples/amok ${CMAKE_HOME_DIRECTORY}/examples/amok/saturate/saturate_sg_64.tesh)
+      ADD_TEST(amok-bandwidth-sg-64-ucontext    ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/amok --cd ${CMAKE_BINARY_DIR}/examples/amok ${CMAKE_HOME_DIRECTORY}/examples/amok/bandwidth/bandwidth_sg_64.tesh)
     endif(CONTEXT_UCONTEXT)
-       if(HAVE_RAWCTX)
-           set_tests_properties(mc-centralized-raw PROPERTIES WILL_FAIL true)
-       endif(HAVE_RAWCTX)
-endif(HAVE_MC)
+  ENDIF(${ARCH_32_BITS})
+
+  # simdag examples
+  ADD_TEST(simdag-test-dotload                  ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/simdag/dot --cd ${CMAKE_BINARY_DIR}/examples/simdag/dot ${CMAKE_HOME_DIRECTORY}/examples/simdag/dot/test_simdag_dotload.tesh)
+  ADD_TEST(simdag-test-simdag                   ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/simdag --cd ${CMAKE_BINARY_DIR}/examples/simdag ${CMAKE_HOME_DIRECTORY}/examples/simdag/test_simdag.tesh)
+  ADD_TEST(simdag-test-simdag2                  ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/simdag --cd ${CMAKE_BINARY_DIR}/examples/simdag ${CMAKE_HOME_DIRECTORY}/examples/simdag/test_simdag2.tesh)
+  ADD_TEST(simdag-test-seq-access               ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/simdag --cd ${CMAKE_BINARY_DIR}/examples/simdag ${CMAKE_HOME_DIRECTORY}/examples/simdag/test_simdag_seq_access.tesh)
+  ADD_TEST(simdag-test-typed-tasks              ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/simdag --cd ${CMAKE_BINARY_DIR}/examples/simdag ${CMAKE_HOME_DIRECTORY}/examples/simdag/test_simdag_typed_tasks.tesh)
+  ADD_TEST(simdag-test-comm-throttling          ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/simdag --cd ${CMAKE_BINARY_DIR}/examples/simdag ${CMAKE_HOME_DIRECTORY}/examples/simdag/test_simdag_comm_throttling.tesh)
+  ADD_TEST(simdag-test-dax-cycle                ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/simdag/dax --cd ${CMAKE_BINARY_DIR}/examples/simdag/dax ${CMAKE_HOME_DIRECTORY}/examples/simdag/dax/simple_dax_with_cycle.tesh)
+  ADD_TEST(simdag-test-prop                     ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/simdag --cd ${CMAKE_BINARY_DIR}/examples/simdag ${CMAKE_HOME_DIRECTORY}/examples/simdag/properties/test_prop.tesh)
+  ADD_TEST(simdag-test-minmin-scheduling        ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv bindir=${CMAKE_BINARY_DIR}/examples/simdag/scheduling --cd ${CMAKE_HOME_DIRECTORY}/examples/simdag/scheduling test_minmin.tesh)
+
+  ADD_TEST(msg-gtnets-crosstraffic-thread       ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-crosstraffic.tesh)
+  if(CONTEXT_UCONTEXT)
+    ADD_TEST(msg-gtnets-crosstraffic-ucontext   ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-crosstraffic.tesh)
+  endif(CONTEXT_UCONTEXT)
+  if(HAVE_RAWCTX)
+    ADD_TEST(msg-gtnets-crosstraffic-raw        ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-crosstraffic.tesh)
+  endif(HAVE_RAWCTX)
 
-endif(release)
+  if(HAVE_GTNETS)
+    ADD_TEST(msg-gtnets-waxman-thread           ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-waxman.tesh)
+    ADD_TEST(msg-gtnets-dogbone-thread          ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-dogbone-gtnets.tesh)
+    ADD_TEST(msg-gtnets-onelink-thread          ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-onelink-gtnets.tesh)
+    ADD_TEST(msg-gtnets-dogbone-lv08-thread     ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-dogbone-lv08.tesh)
+    ADD_TEST(msg-gtnets-onelink-lv08-thread     ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-onelink-lv08.tesh)
+    if(CONTEXT_UCONTEXT)
+      ADD_TEST(msg-gtnets-waxman-ucontext       ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-waxman.tesh)
+      ADD_TEST(msg-gtnets-dogbone-ucontext      ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-dogbone-gtnets.tesh)
+      ADD_TEST(msg-gtnets-onelink-ucontext      ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-onelink-gtnets.tesh)
+      ADD_TEST(msg-gtnets-dogbone-lv08-ucontext ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-dogbone-lv08.tesh)
+      ADD_TEST(msg-gtnets-onelink-lv08-ucontext ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-onelink-lv08.tesh)
+    endif(CONTEXT_UCONTEXT)
+    if(HAVE_RAWCTX)
+      ADD_TEST(msg-gtnets-waxman-raw            ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-waxman.tesh)
+      ADD_TEST(msg-gtnets-dogbone-raw           ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-dogbone-gtnets.tesh)
+      ADD_TEST(msg-gtnets-onelink-raw           ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-onelink-gtnets.tesh)
+      ADD_TEST(msg-gtnets-dogbone-lv08-raw      ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-dogbone-lv08.tesh)
+      ADD_TEST(msg-gtnets-onelink-lv08-raw      ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-onelink-lv08.tesh)
+    endif(HAVE_RAWCTX)
+
+    if(HAVE_TRACING)
+      ADD_TEST(msg-tracing-gtnets-waxman        ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/tracing-gtnets-waxman.tesh)
+      ADD_TEST(msg-tracing-gtnets-dogbone       ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/tracing-gtnets-dogbone-gtnets.tesh)
+      ADD_TEST(msg-tracing-gtnets-onelink       ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/tracing-gtnets-onelink-gtnets.tesh)
+      ADD_TEST(msg-tracing-gtnets-dogbone-lv08  ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/tracing-gtnets-dogbone-lv08.tesh)
+      ADD_TEST(msg-tracing-gtnets-onelink-lv08  ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/tracing-gtnets-onelink-lv08.tesh)
+    endif(HAVE_TRACING)
+  endif(HAVE_GTNETS)
+
+  if(HAVE_NS3)
+    ADD_TEST(msg-ns3-thread                     ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY} --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/ns3/ns3.tesh)
+    ADD_TEST(msg-ns3-ucontext                   ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY} --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/ns3/ns3.tesh)
+    ADD_TEST(msg-ns3-raw                        ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY} --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/ns3/ns3.tesh)
+  endif(HAVE_NS3)
+
+  IF(HAVE_TRACING)
+    ADD_TEST(tracing-help                       ${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms/basic_parsing_test --help-tracing)
+    ADD_TEST(tracing-ms                         ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg --cd ${CMAKE_HOME_DIRECTORY}/examples/msg tracing/ms.tesh)
+    ADD_TEST(tracing-trace_platform             ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg --cd ${CMAKE_HOME_DIRECTORY}/examples/msg tracing/trace_platform.tesh)
+    ADD_TEST(tracing-user_variables             ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg --cd ${CMAKE_HOME_DIRECTORY}/examples/msg tracing/user_variables.tesh)
+    ADD_TEST(tracing-link_user_variables        ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg --cd ${CMAKE_HOME_DIRECTORY}/examples/msg tracing/link_user_variables.tesh)
+    ADD_TEST(tracing-link_srcdst_user_variables ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg --cd ${CMAKE_HOME_DIRECTORY}/examples/msg tracing/link_srcdst_user_variables.tesh)
+    ADD_TEST(tracing-categories                 ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg --cd ${CMAKE_HOME_DIRECTORY}/examples/msg tracing/categories.tesh)
+    ADD_TEST(tracing-process-migration          ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg --cd ${CMAKE_HOME_DIRECTORY}/examples/msg tracing/procmig.tesh)
+    ADD_TEST(graphicator                        ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} --setenv bindir=${CMAKE_BINARY_DIR}/bin --cd ${CMAKE_HOME_DIRECTORY}/tools/graphicator graphicator.tesh)
+  ENDIF(HAVE_TRACING)
+
+  # Lua examples
+  if(HAVE_LUA)
+    ADD_TEST(lua-duplicated-globals             ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd ${CMAKE_HOME_DIRECTORY}/examples/lua/state_cloner duplicated_globals.tesh)
+    ADD_TEST(lua-masterslave                    ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd ${CMAKE_HOME_DIRECTORY}/examples/lua/masterslave master_slave.tesh)
+    ADD_TEST(lua-mult-matrix                    ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd ${CMAKE_HOME_DIRECTORY}/examples/lua/multi_matrix mult_matrix.tesh)
+    ADD_TEST(lua-masterslave-bypass             ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd ${CMAKE_HOME_DIRECTORY}/examples/lua/console master_slave_bypass.tesh)
+    ADD_TEST(lua-msg-masterslave-console        ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd ${CMAKE_BINARY_DIR}/examples/msg/masterslave --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_console.tesh)
+    ADD_TEST(lua-chord                          ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd ${CMAKE_HOME_DIRECTORY}/examples/lua/chord chord.tesh)
+    ADD_TEST(simdag-test-lua                    ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd ${CMAKE_HOME_DIRECTORY}/examples/simdag test_simdag2_lua.tesh)
+    set_tests_properties(lua-duplicated-globals         PROPERTIES ENVIRONMENT "LUA_CPATH=${CMAKE_BINARY_DIR}/examples/lua/?.so")
+    set_tests_properties(lua-masterslave                PROPERTIES ENVIRONMENT "LUA_CPATH=${CMAKE_BINARY_DIR}/examples/lua/?.so")
+    set_tests_properties(lua-mult-matrix                PROPERTIES ENVIRONMENT "LUA_CPATH=${CMAKE_BINARY_DIR}/examples/lua/?.so")
+    set_tests_properties(lua-masterslave-bypass         PROPERTIES ENVIRONMENT "LUA_CPATH=${CMAKE_BINARY_DIR}/examples/lua/?.so")
+    set_tests_properties(lua-msg-masterslave-console    PROPERTIES ENVIRONMENT "LUA_CPATH=${CMAKE_BINARY_DIR}/examples/lua/?.so")
+    set_tests_properties(lua-chord                      PROPERTIES ENVIRONMENT "LUA_CPATH=${CMAKE_BINARY_DIR}/examples/lua/?.so")
+    set_tests_properties(simdag-test-lua                PROPERTIES ENVIRONMENT "LUA_CPATH=${CMAKE_BINARY_DIR}/examples/lua/?.so")
+  endif(HAVE_LUA)
+
+  # END TESH TESTS
+
+  if(enable_smpi)
+    # smpi examples
+    ADD_TEST(smpi-bcast-thread                  ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --cd ${CMAKE_BINARY_DIR}/examples/smpi ${CMAKE_HOME_DIRECTORY}/examples/smpi/bcast.tesh)
+    ADD_TEST(smpi-reduce-thread                 ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --cd ${CMAKE_BINARY_DIR}/examples/smpi ${CMAKE_HOME_DIRECTORY}/examples/smpi/reduce.tesh)
+    if(HAVE_RAWCTX)
+      ADD_TEST(smpi-bcast-raw                   ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --cd ${CMAKE_BINARY_DIR}/examples/smpi ${CMAKE_HOME_DIRECTORY}/examples/smpi/bcast.tesh)
+      ADD_TEST(smpi-reduce-raw                  ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --cd ${CMAKE_BINARY_DIR}/examples/smpi ${CMAKE_HOME_DIRECTORY}/examples/smpi/reduce.tesh)
+    endif(HAVE_RAWCTX)
+    if(CONTEXT_UCONTEXT)
+      ADD_TEST(smpi-bcast-ucontext              ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --cd ${CMAKE_BINARY_DIR}/examples/smpi ${CMAKE_HOME_DIRECTORY}/examples/smpi/bcast.tesh)
+      ADD_TEST(smpi-reduce-ucontext             ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --cd ${CMAKE_BINARY_DIR}/examples/smpi ${CMAKE_HOME_DIRECTORY}/examples/smpi/reduce.tesh)
+    endif(CONTEXT_UCONTEXT)
+    if(HAVE_TRACING)
+      ADD_TEST(smpi-tracing-ptp                 ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd ${CMAKE_BINARY_DIR}/examples/smpi ${CMAKE_HOME_DIRECTORY}/examples/smpi/tracing/smpi_traced.tesh)
+    endif(HAVE_TRACING)
+  endif(enable_smpi)
+
+  # examples/msg/mc
+  if(HAVE_MC)
+    ADD_TEST(mc-bugged1-thread                  ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/mc --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/mc bugged1.tesh)
+    ADD_TEST(mc-bugged2-thread                  ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/mc --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/mc bugged2.tesh)
+    ADD_TEST(mc-centralized-thread              ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/mc --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/mc centralized.tesh)
+    if(CONTEXT_UCONTEXT)
+      ADD_TEST(mc-bugged1-ucontext              ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/mc --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/mc bugged1.tesh)
+      ADD_TEST(mc-bugged2-ucontext              ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/mc --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/mc bugged2.tesh)
+      ADD_TEST(mc-centralized-ucontext          ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/mc --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/mc centralized.tesh)
+    endif(CONTEXT_UCONTEXT)
+    if(HAVE_RAWCTX)
+      ADD_TEST(mc-bugged1-raw                   ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/mc --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/mc bugged1.tesh)
+      ADD_TEST(mc-bugged2-raw                   ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/mc --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/mc bugged2.tesh)
+      ADD_TEST(mc-centralized-raw               ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/mc --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/mc centralized.tesh)
+    endif(HAVE_RAWCTX)
+  endif(HAVE_MC)
+
+  ###
+  ### Declare that we know that some tests are broken
+  ###
+
+  # Amok is broken in RL since before v3.3 (should fix it one day)
+  set_tests_properties(amok-bandwidth-rl amok-saturate-rl PROPERTIES WILL_FAIL true)
+  if(${ARCH_32_BITS})
+    set_tests_properties(amok-bandwidth-sg-32-thread PROPERTIES WILL_FAIL true)
+    set_tests_properties(amok-saturate-sg-32-thread PROPERTIES WILL_FAIL true)
+    if(CONTEXT_UCONTEXT)
+      set_tests_properties(amok-bandwidth-sg-32-ucontext amok-saturate-sg-32-ucontext PROPERTIES WILL_FAIL true)
+    endif(CONTEXT_UCONTEXT)
+    if(HAVE_RAWCTX)
+      set_tests_properties(amok-bandwidth-sg-32-raw amok-saturate-sg-32-raw PROPERTIES WILL_FAIL true)
+    endif(HAVE_RAWCTX)
+  else(${ARCH_32_BITS})
+    set_tests_properties(amok-bandwidth-sg-64-thread PROPERTIES WILL_FAIL true)
+    set_tests_properties(amok-saturate-sg-64-thread PROPERTIES WILL_FAIL true)
+    if(CONTEXT_UCONTEXT)
+      set_tests_properties(amok-bandwidth-sg-64-ucontext amok-saturate-sg-64-ucontext PROPERTIES WILL_FAIL true)
+    endif(CONTEXT_UCONTEXT)
+    if(HAVE_RAWCTX)
+      set_tests_properties(amok-bandwidth-sg-64-raw amok-saturate-sg-64-raw PROPERTIES WILL_FAIL true)
+    endif(HAVE_RAWCTX)
+  endif(${ARCH_32_BITS})
+
+  # Those tests are broken : set to "fail" for release v3.6
+  if(release)
+    if(HAVE_MC)
+      set_tests_properties(mc-bugged1-thread PROPERTIES WILL_FAIL true)
+      set_tests_properties(mc-bugged2-thread PROPERTIES WILL_FAIL true)
+      set_tests_properties(mc-centralized-thread PROPERTIES WILL_FAIL true)
+      if(CONTEXT_UCONTEXT)
+        set_tests_properties(mc-centralized-ucontext PROPERTIES WILL_FAIL true)
+      endif(CONTEXT_UCONTEXT)
+      if(HAVE_RAWCTX)
+        set_tests_properties(mc-centralized-raw PROPERTIES WILL_FAIL true)
+      endif(HAVE_RAWCTX)
+    endif(HAVE_MC)
+
+  endif(release)
 
 endif(NOT enable_memcheck)
 
-ADD_TEST(tesh-simdag-full-links01              ${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms/basic_parsing_test ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms/two_clusters.xml FULL_LINK)
-ADD_TEST(tesh-simdag-full-links02              ${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms/basic_parsing_test ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms/two_clusters_one_name.xml FULL_LINK)
-ADD_TEST(tesh-simdag-one-link-g5k              ${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms/basic_parsing_test ${CMAKE_HOME_DIRECTORY}/examples/platforms/g5k.xml ONE_LINK)
-ADD_TEST(msg-icomms-waitany                    ${CMAKE_BINARY_DIR}/examples/msg/icomms/peer3 ${CMAKE_HOME_DIRECTORY}/examples/msg/icomms/small_platform.xml ${CMAKE_HOME_DIRECTORY}/examples/msg/icomms/deployment_peer05.xml)
+ADD_TEST(tesh-simdag-full-links01               ${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms/basic_parsing_test ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms/two_clusters.xml FULL_LINK)
+ADD_TEST(tesh-simdag-full-links02               ${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms/basic_parsing_test ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms/two_clusters_one_name.xml FULL_LINK)
+ADD_TEST(tesh-simdag-one-link-g5k               ${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms/basic_parsing_test ${CMAKE_HOME_DIRECTORY}/examples/platforms/g5k.xml ONE_LINK)
+ADD_TEST(msg-icomms-waitany                     ${CMAKE_BINARY_DIR}/examples/msg/icomms/peer3 ${CMAKE_HOME_DIRECTORY}/examples/msg/icomms/small_platform.xml ${CMAKE_HOME_DIRECTORY}/examples/msg/icomms/deployment_peer05.xml)
 
 # testsuite directory
-add_test(test-xbt-log          ${CMAKE_BINARY_DIR}/testsuite/xbt/log_usage)
-add_test(test-xbt-graphxml     ${CMAKE_BINARY_DIR}/testsuite/xbt/graphxml_usage ${CMAKE_HOME_DIRECTORY}/testsuite/xbt/graph.xml)
-add_test(test-xbt-heap         ${CMAKE_BINARY_DIR}/testsuite/xbt/heap_bench)
+add_test(test-xbt-log                           ${CMAKE_BINARY_DIR}/testsuite/xbt/log_usage)
+add_test(test-xbt-graphxml                      ${CMAKE_BINARY_DIR}/testsuite/xbt/graphxml_usage ${CMAKE_HOME_DIRECTORY}/testsuite/xbt/graph.xml)
+add_test(test-xbt-heap                          ${CMAKE_BINARY_DIR}/testsuite/xbt/heap_bench)
 
-add_test(test-surf-lmm         ${CMAKE_BINARY_DIR}/testsuite/surf/lmm_usage)
-add_test(test-surf-maxmin      ${CMAKE_BINARY_DIR}/testsuite/surf/maxmin_bench)
-add_test(test-surf-usage       ${CMAKE_BINARY_DIR}/testsuite/surf/surf_usage  --cfg=path:${CMAKE_HOME_DIRECTORY}/testsuite/surf/ platform.xml)
-add_test(test-surf-usage2      ${CMAKE_BINARY_DIR}/testsuite/surf/surf_usage2  --cfg=path:${CMAKE_HOME_DIRECTORY}/testsuite/surf/ platform.xml)
-add_test(test-surf-trace       ${CMAKE_BINARY_DIR}/testsuite/surf/trace_usage --cfg=path:${CMAKE_HOME_DIRECTORY}/testsuite/surf/)
+add_test(test-surf-lmm                          ${CMAKE_BINARY_DIR}/testsuite/surf/lmm_usage)
+add_test(test-surf-maxmin                       ${CMAKE_BINARY_DIR}/testsuite/surf/maxmin_bench)
+add_test(test-surf-usage                        ${CMAKE_BINARY_DIR}/testsuite/surf/surf_usage --cfg=path:${CMAKE_HOME_DIRECTORY}/testsuite/surf/ platform.xml)
+add_test(test-surf-usage2                       ${CMAKE_BINARY_DIR}/testsuite/surf/surf_usage2 --cfg=path:${CMAKE_HOME_DIRECTORY}/testsuite/surf/ platform.xml)
+add_test(test-surf-trace                        ${CMAKE_BINARY_DIR}/testsuite/surf/trace_usage --cfg=path:${CMAKE_HOME_DIRECTORY}/testsuite/surf/)
 
-add_test(testall               ${CMAKE_BINARY_DIR}/src/testall)
+add_test(testall                                ${CMAKE_BINARY_DIR}/src/testall)
 
 if(enable_auto_install)
-add_test(simgrid_install               make install)
+  add_test(simgrid_install                      make install)
 endif(enable_auto_install)
 
 if(enable_memcheck)
-include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/memcheck_tests.cmake)
+  include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/memcheck_tests.cmake)
 endif(enable_memcheck)
index 6e833ce..dd4935c 100644 (file)
@@ -2,36 +2,36 @@
 # http://www.cmake.org/Wiki/CMake_Testing_With_CTest#Customizing_CTest
 
 if(APPLE)
-       SET(BUILDNAME "APPLE" CACHE TYPE INTERNAL FORCE)
+  SET(BUILDNAME "APPLE" CACHE TYPE INTERNAL FORCE)
 else(APPLE)
-       SET(BUILDNAME "UNIX" CACHE TYPE INTERNAL FORCE)
-       if(WIN32)
-       SET(BUILDNAME "WINDOWS" CACHE TYPE INTERNAL FORCE)
-       endif(WIN32)
+  SET(BUILDNAME "UNIX" CACHE TYPE INTERNAL FORCE)
+  if(WIN32)
+    SET(BUILDNAME "WINDOWS" CACHE TYPE INTERNAL FORCE)
+  endif(WIN32)
 endif(APPLE)
 
 if(enable_memcheck)
-       set(CTEST_TIMEOUT "300") #TIMEOUT FOR EACH TEST
+  set(CTEST_TIMEOUT "300") #TIMEOUT FOR EACH TEST
 endif(enable_memcheck)
 
 if(enable_compile_warnings AND enable_compile_optimizations)
-       SET(BUILDNAME "FULL_FLAGS" CACHE TYPE INTERNAL FORCE)
+  SET(BUILDNAME "FULL_FLAGS" CACHE TYPE INTERNAL FORCE)
 endif(enable_compile_warnings AND enable_compile_optimizations)
 
 if(enable_supernovae)
-       SET(BUILDNAME "SUPERNOVAE" CACHE TYPE INTERNAL FORCE)
+  SET(BUILDNAME "SUPERNOVAE" CACHE TYPE INTERNAL FORCE)
 endif(enable_supernovae)
 
 if(HAVE_GTNETS)
-       SET(BUILDNAME "GTNETS" CACHE TYPE INTERNAL FORCE)
+  SET(BUILDNAME "GTNETS" CACHE TYPE INTERNAL FORCE)
 endif(HAVE_GTNETS)
 
 if(HAVE_MC)
-       SET(BUILDNAME "MODEL-CHECKING" CACHE TYPE INTERNAL FORCE)
+  SET(BUILDNAME "MODEL-CHECKING" CACHE TYPE INTERNAL FORCE)
 endif(HAVE_MC)
 
 if(enable_memcheck)
-       SET(BUILDNAME "MEMCHECK" CACHE TYPE INTERNAL FORCE)
+  SET(BUILDNAME "MEMCHECK" CACHE TYPE INTERNAL FORCE)
 endif(enable_memcheck)
 
 set(osname ${CMAKE_SYSTEM_NAME})
@@ -46,5 +46,5 @@ SET(CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE "3000000")
 
 set(PIPOL_IMAGE $ENV{PIPOL_IMAGE})
 if(NOT ${PIPOL_IMAGE} MATCHES "\n")
-set(SITE ${PIPOL_IMAGE})
+  set(SITE ${PIPOL_IMAGE})
 endif(NOT ${PIPOL_IMAGE} MATCHES "\n")
index bf896dd..77f54c4 100644 (file)
@@ -1,60 +1,60 @@
-set(CMAKE_MODULE_PATH 
-${CMAKE_MODULE_PATH}
-${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Modules
-)
+set(CMAKE_MODULE_PATH
+  ${CMAKE_MODULE_PATH}
+  ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Modules
+  )
 
 # x86_64
 # x86
 # i.86
 
 IF(CMAKE_SYSTEM_PROCESSOR MATCHES ".86")
-    IF(${ARCH_32_BITS})
-        set(PROCESSOR_i686 1)
-        set(SIMGRID_SYSTEM_PROCESSOR "${CMAKE_SYSTEM_PROCESSOR}")
-        message(STATUS "System processor: ${CMAKE_SYSTEM_PROCESSOR}")
-    ELSE(${ARCH_32_BITS})
-        message(STATUS "System processor: amd64")
-        set(SIMGRID_SYSTEM_PROCESSOR "amd64")
-        set(PROCESSOR_x86_64 1)
-        set(PROCESSOR_i686 0)
-    ENDIF(${ARCH_32_BITS})          
-    set(HAVE_RAWCTX 1)
-    
+  IF(${ARCH_32_BITS})
+    set(PROCESSOR_i686 1)
+    set(SIMGRID_SYSTEM_PROCESSOR "${CMAKE_SYSTEM_PROCESSOR}")
+    message(STATUS "System processor: ${CMAKE_SYSTEM_PROCESSOR}")
+  ELSE(${ARCH_32_BITS})
+    message(STATUS "System processor: amd64")
+    set(SIMGRID_SYSTEM_PROCESSOR "amd64")
+    set(PROCESSOR_x86_64 1)
+    set(PROCESSOR_i686 0)
+  ENDIF(${ARCH_32_BITS})
+  set(HAVE_RAWCTX 1)
+
 ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^alpha")
-    message(STATUS "System processor: alpha")
-    
+  message(STATUS "System processor: alpha")
+
 ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
-    # Subdir is "arm" for both big-endian (arm) and little-endian (armel).
-    message(STATUS "System processor: arm")
-    
+  # Subdir is "arm" for both big-endian (arm) and little-endian (armel).
+  message(STATUS "System processor: arm")
+
 ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^mips")
-    # mips* machines are bi-endian mostly so processor does not tell
-    # endianess of the underlying system.
-    message(STATUS "System processor: ${CMAKE_SYSTEM_PROCESSOR}" "mips" "mipsel" "mipseb")
-    
+  # mips* machines are bi-endian mostly so processor does not tell
+  # endianess of the underlying system.
+  message(STATUS "System processor: ${CMAKE_SYSTEM_PROCESSOR}" "mips" "mipsel" "mipseb")
+
 ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64")
-    message(STATUS "System processor: ppc64")
-    
+  message(STATUS "System processor: ppc64")
+
 ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)")
-    message(STATUS "System processor: ppc")
-    
+  message(STATUS "System processor: ppc")
+
 ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^sparc")
-    # Both flavours can run on the same processor
-    message(STATUS "System processor: ${CMAKE_SYSTEM_PROCESSOR}" "sparc" "sparcv9")
-    
+  # Both flavours can run on the same processor
+  message(STATUS "System processor: ${CMAKE_SYSTEM_PROCESSOR}" "sparc" "sparcv9")
+
 ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^(parisc|hppa)")
-    message(STATUS "System processor: parisc" "parisc64")
-    
+  message(STATUS "System processor: parisc" "parisc64")
+
 ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^s390")
-    # s390 binaries can run on s390x machines
-    message(STATUS "System processor: ${CMAKE_SYSTEM_PROCESSOR}" "s390" "s390x")
-    
+  # s390 binaries can run on s390x machines
+  message(STATUS "System processor: ${CMAKE_SYSTEM_PROCESSOR}" "s390" "s390x")
+
 ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^sh")
-    message(STATUS "System processor: sh")
-    
+  message(STATUS "System processor: sh")
+
 ELSE(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") #PROCESSOR NOT fIND
-    message(STATUS "PROCESSOR NOT FOUND: ${CMAKE_SYSTEM_PROCESSOR}")
-    
+  message(STATUS "PROCESSOR NOT FOUND: ${CMAKE_SYSTEM_PROCESSOR}")
+
 ENDIF(CMAKE_SYSTEM_PROCESSOR MATCHES ".86")
 
 message(STATUS "Cmake version ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}")
@@ -69,27 +69,27 @@ TEST_BIG_ENDIAN(BIGENDIAN)
 
 include(FindGraphviz)
 if(WIN32)
-include(FindPcreWin)
+  include(FindPcreWin)
 else(WIN32)
-include(FindPCRE)  
+  include(FindPCRE)
 endif(WIN32)
 
 set(HAVE_GTNETS 0)
-if(enable_gtnets)      
-       include(FindGTnets)
+if(enable_gtnets)
+  include(FindGTnets)
 endif(enable_gtnets)
 if(enable_smpi)
-       include(FindF2c)
-       if(HAVE_F2C_H)
-        SET(HAVE_SMPI 1)
-    endif(HAVE_F2C_H)
+  include(FindF2c)
+  if(HAVE_F2C_H)
+    SET(HAVE_SMPI 1)
+  endif(HAVE_F2C_H)
 endif(enable_smpi)
 if(enable_lua)
-       include(FindLua51Simgrid)
+  include(FindLua51Simgrid)
 endif(enable_lua)
 set(HAVE_NS3 0)
 if(enable_ns3)
-       include(FindNS3)
+  include(FindNS3)
 endif(enable_ns3)
 
 # Checks for header libraries functions.
@@ -147,15 +147,15 @@ CHECK_FUNCTION_EXISTS(mergesort HAVE_MERGESORT)
 
 #Check if __thread is defined
 execute_process(
-COMMAND "${CMAKE_C_COMPILER} ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_thread_storage.c"
-WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-RESULT_VARIABLE HAVE_thread_storage_run
-)
+  COMMAND "${CMAKE_C_COMPILER} ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_thread_storage.c"
+  WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+  RESULT_VARIABLE HAVE_thread_storage_run
+  )
 
 if(HAVE_thread_storage_run)
-       set(HAVE_THREAD_LOCAL_STORAGE 0)
+  set(HAVE_THREAD_LOCAL_STORAGE 0)
 else(HAVE_thread_storage_run)
-       set(HAVE_THREAD_LOCAL_STORAGE 1)
+  set(HAVE_THREAD_LOCAL_STORAGE 1)
 endif(HAVE_thread_storage_run)
 
 # Our usage of mmap is Linux-specific (flag MAP_ANONYMOUS), but kFreeBSD uses a GNU libc
@@ -165,10 +165,10 @@ IF(NOT "${CMAKE_SYSTEM}" MATCHES "Linux" AND NOT "${CMAKE_SYSTEM}" MATCHES "kFre
 ENDIF(NOT "${CMAKE_SYSTEM}" MATCHES "Linux" AND NOT "${CMAKE_SYSTEM}" MATCHES "kFreeBSD" AND NOT "${CMAKE_SYSTEM}" MATCHES "GNU")
 
 if(WIN32) #THOSE FILES ARE FUNCTIONS ARE NOT DETECTED BUT THEY SHOULD...
-    set(HAVE_UCONTEXT_H 1)
-    set(HAVE_MAKECONTEXT 1)
-    set(HAVE_SNPRINTF 1)
-    set(HAVE_VSNPRINTF 1)
+  set(HAVE_UCONTEXT_H 1)
+  set(HAVE_MAKECONTEXT 1)
+  set(HAVE_SNPRINTF 1)
+  set(HAVE_VSNPRINTF 1)
 endif(WIN32)
 
 set(CONTEXT_UCONTEXT 0)
@@ -176,17 +176,17 @@ SET(CONTEXT_THREADS 0)
 SET(HAVE_TRACING 1)
 
 if(enable_tracing)
-       SET(HAVE_TRACING 1)
-else(enable_tracing)   
-       SET(HAVE_TRACING 0)
+  SET(HAVE_TRACING 1)
+else(enable_tracing)
+  SET(HAVE_TRACING 0)
 endif(enable_tracing)
 
 if(enable_jedule)
-       SET(HAVE_JEDULE 1)
+  SET(HAVE_JEDULE 1)
 endif(enable_jedule)
 
 if(enable_latency_bound_tracking)
-       SET(HAVE_LATENCY_BOUND_TRACKING 1)
+  SET(HAVE_LATENCY_BOUND_TRACKING 1)
 else(enable_latency_bound_tracking)
   if(enable_gtnets)
     message(STATUS "Warning : Turning latency_bound_tracking to ON because GTNeTs is ON")
@@ -198,11 +198,11 @@ else(enable_latency_bound_tracking)
 endif(enable_latency_bound_tracking)
 
 if(enable_model-checking AND HAVE_MMAP)
-       SET(HAVE_MC 1)
-       SET(MMALLOC_WANT_OVERRIDE_LEGACY 1)
+  SET(HAVE_MC 1)
+  SET(MMALLOC_WANT_OVERRIDE_LEGACY 1)
 else(enable_model-checking AND HAVE_MMAP)
-       SET(HAVE_MC 0)
-       SET(MMALLOC_WANT_OVERRIDE_LEGACY 0)
+  SET(HAVE_MC 0)
+  SET(MMALLOC_WANT_OVERRIDE_LEGACY 0)
 endif(enable_model-checking AND HAVE_MMAP)
 
 #--------------------------------------------------------------------------------------------------
@@ -210,222 +210,220 @@ endif(enable_model-checking AND HAVE_MMAP)
 CHECK_TYPE_SIZE(int SIZEOF_INT)
 CHECK_TYPE_SIZE(void* SIZEOF_VOIDP)
 
-
 #--------------------------------------------------------------------------------------------------
 ### Initialize of CONTEXT THREADS
 
 if(pthread)
-       set(pthread 1)
+  set(pthread 1)
 elseif(pthread)
-       set(pthread 0)
+  set(pthread 0)
 endif(pthread)
 
 if(pthread)
-       ### Test that we have a way to create semaphores
-
-    if(HAVE_SEM_OPEN_LIB)
-    
-        exec_program(
-        "${CMAKE_C_COMPILER} ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_sem_open.c -lpthread -o testprog"
-        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-        OUTPUT_VARIABLE HAVE_SEM_OPEN_compil
-        )
-    
-       if(HAVE_SEM_OPEN_compil)
-               set(HAVE_SEM_OPEN 0)
-               message(STATUS "Warning: sem_open not compilable")
-               message(STATUS "HAVE_SEM_OPEN_comp_output: ${HAVE_SEM_OPEN_comp_output}")       
-       else(HAVE_SEM_OPEN_compil)
-               set(HAVE_SEM_OPEN 1)
-            message(STATUS "sem_open is compilable")
-       endif(HAVE_SEM_OPEN_compil)
-        
-        exec_program("${CMAKE_BINARY_DIR}/testprog" RETURN_VALUE HAVE_SEM_OPEN_run OUTPUT_VARIABLE var_compil)
-        file(REMOVE "${CMAKE_BINARY_DIR}/testprog*")
-       
-       if(NOT HAVE_SEM_OPEN_run)
-           set(HAVE_SEM_OPEN 1)
-            message(STATUS "sem_open is executable")
-        else(NOT HAVE_SEM_OPEN_run)
-               set(HAVE_SEM_OPEN 0)
-           message(STATUS "Warning: sem_open not executable")          
-        endif(NOT HAVE_SEM_OPEN_run)   
-    
-    else(HAVE_SEM_OPEN_LIB)
-               set(HAVE_SEM_OPEN 0)
-       endif(HAVE_SEM_OPEN_LIB)
-
-       if(HAVE_SEM_INIT_LIB)
-        exec_program(
-        "${CMAKE_C_COMPILER} ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_sem_init.c -lpthread -o testprog"
-        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-        OUTPUT_VARIABLE HAVE_SEM_INIT_compil
-        )
-    
-       if(HAVE_SEM_INIT_compil)
-               set(HAVE_SEM_INIT 0)
-               message(STATUS "Warning: sem_init not compilable")
-               message(STATUS "HAVE_SEM_INIT_comp_output: ${HAVE_SEM_OPEN_comp_output}")       
-       else(HAVE_SEM_INIT_compil)
-               set(HAVE_SEM_INIT 1)
-            message(STATUS "sem_init is compilable")
-       endif(HAVE_SEM_INIT_compil)
-
-        exec_program("${CMAKE_BINARY_DIR}/testprog" RETURN_VALUE HAVE_SEM_INIT_run OUTPUT_VARIABLE var_compil)
-        file(REMOVE "${CMAKE_BINARY_DIR}/testprog*")
-        
-       if(NOT HAVE_SEM_INIT_run)
-           set(HAVE_SEM_INIT 1)
-            message(STATUS "sem_init is executable")
-        else(NOT HAVE_SEM_INIT_run)
-               set(HAVE_SEM_INIT 0)
-           message(STATUS "Warning: sem_init not executable")
-        endif(NOT HAVE_SEM_INIT_run)   
-       endif(HAVE_SEM_INIT_LIB)
-
-       if(NOT HAVE_SEM_OPEN AND NOT HAVE_SEM_INIT)
-               message(FATAL_ERROR "Semaphores are not usable (neither sem_open nor sem_init is both compilable and executable), but they are mandatory to threads (you may need to mount /dev).")
-       endif(NOT HAVE_SEM_OPEN AND NOT HAVE_SEM_INIT)
-
-       ### Test that we have a way to timewait for semaphores
-
-       if(HAVE_SEM_TIMEDWAIT_LIB)
-
-        execute_process(
-        COMMAND "${CMAKE_C_COMPILER} ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_sem_timedwait.c -lpthread"
-        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-        OUTPUT_VARIABLE HAVE_SEM_TIMEDWAIT_run
-        )
-        
-               if(HAVE_SEM_TIMEDWAIT_run)
-                       set(HAVE_SEM_TIMEDWAIT 0)
-                       message(STATUS "timedwait not compilable")
-               else(HAVE_SEM_TIMEDWAIT_run)
-                       set(HAVE_SEM_TIMEDWAIT 1)
-            message(STATUS "timedwait is compilable")
-               endif(HAVE_SEM_TIMEDWAIT_run)
-       endif(HAVE_SEM_TIMEDWAIT_LIB)
-
-       ### HAVE_MUTEX_TIMEDLOCK
-
-       if(HAVE_MUTEX_TIMEDLOCK_LIB)
-
-        execute_process(
-        COMMAND "${CMAKE_C_COMPILER} ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_mutex_timedlock.c -lpthread"
-        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-        OUTPUT_VARIABLE HAVE_MUTEX_TIMEDLOCK_run
-        )
-
-               if(HAVE_MUTEX_TIMEDLOCK_run)
-                       set(HAVE_MUTEX_TIMEDLOCK 0)
-                       message(STATUS "timedlock not compilable")
-               else(HAVE_MUTEX_TIMEDLOCK_run)
-                       message(STATUS "timedlock is compilable")
-                       set(HAVE_MUTEX_TIMEDLOCK 1)
-               endif(HAVE_MUTEX_TIMEDLOCK_run)
-       endif(HAVE_MUTEX_TIMEDLOCK_LIB)
+  ### Test that we have a way to create semaphores
+
+  if(HAVE_SEM_OPEN_LIB)
+
+    exec_program(
+      "${CMAKE_C_COMPILER} ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_sem_open.c -lpthread -o testprog"
+      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+      OUTPUT_VARIABLE HAVE_SEM_OPEN_compil
+      )
+
+    if(HAVE_SEM_OPEN_compil)
+      set(HAVE_SEM_OPEN 0)
+      message(STATUS "Warning: sem_open not compilable")
+      message(STATUS "HAVE_SEM_OPEN_comp_output: ${HAVE_SEM_OPEN_comp_output}")
+    else(HAVE_SEM_OPEN_compil)
+      set(HAVE_SEM_OPEN 1)
+      message(STATUS "sem_open is compilable")
+    endif(HAVE_SEM_OPEN_compil)
+
+    exec_program("${CMAKE_BINARY_DIR}/testprog" RETURN_VALUE HAVE_SEM_OPEN_run OUTPUT_VARIABLE var_compil)
+    file(REMOVE "${CMAKE_BINARY_DIR}/testprog*")
+
+    if(NOT HAVE_SEM_OPEN_run)
+      set(HAVE_SEM_OPEN 1)
+      message(STATUS "sem_open is executable")
+    else(NOT HAVE_SEM_OPEN_run)
+      set(HAVE_SEM_OPEN 0)
+      message(STATUS "Warning: sem_open not executable")
+    endif(NOT HAVE_SEM_OPEN_run)
+
+  else(HAVE_SEM_OPEN_LIB)
+    set(HAVE_SEM_OPEN 0)
+  endif(HAVE_SEM_OPEN_LIB)
+
+  if(HAVE_SEM_INIT_LIB)
+    exec_program(
+      "${CMAKE_C_COMPILER} ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_sem_init.c -lpthread -o testprog"
+      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+      OUTPUT_VARIABLE HAVE_SEM_INIT_compil
+      )
+
+    if(HAVE_SEM_INIT_compil)
+      set(HAVE_SEM_INIT 0)
+      message(STATUS "Warning: sem_init not compilable")
+      message(STATUS "HAVE_SEM_INIT_comp_output: ${HAVE_SEM_OPEN_comp_output}")
+    else(HAVE_SEM_INIT_compil)
+      set(HAVE_SEM_INIT 1)
+      message(STATUS "sem_init is compilable")
+    endif(HAVE_SEM_INIT_compil)
+
+    exec_program("${CMAKE_BINARY_DIR}/testprog" RETURN_VALUE HAVE_SEM_INIT_run OUTPUT_VARIABLE var_compil)
+    file(REMOVE "${CMAKE_BINARY_DIR}/testprog*")
+
+    if(NOT HAVE_SEM_INIT_run)
+      set(HAVE_SEM_INIT 1)
+      message(STATUS "sem_init is executable")
+    else(NOT HAVE_SEM_INIT_run)
+      set(HAVE_SEM_INIT 0)
+      message(STATUS "Warning: sem_init not executable")
+    endif(NOT HAVE_SEM_INIT_run)
+  endif(HAVE_SEM_INIT_LIB)
+
+  if(NOT HAVE_SEM_OPEN AND NOT HAVE_SEM_INIT)
+    message(FATAL_ERROR "Semaphores are not usable (neither sem_open nor sem_init is both compilable and executable), but they are mandatory to threads (you may need to mount /dev).")
+  endif(NOT HAVE_SEM_OPEN AND NOT HAVE_SEM_INIT)
+
+  ### Test that we have a way to timewait for semaphores
+
+  if(HAVE_SEM_TIMEDWAIT_LIB)
+
+    execute_process(
+      COMMAND "${CMAKE_C_COMPILER} ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_sem_timedwait.c -lpthread"
+      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+      OUTPUT_VARIABLE HAVE_SEM_TIMEDWAIT_run
+      )
+
+    if(HAVE_SEM_TIMEDWAIT_run)
+      set(HAVE_SEM_TIMEDWAIT 0)
+      message(STATUS "timedwait not compilable")
+    else(HAVE_SEM_TIMEDWAIT_run)
+      set(HAVE_SEM_TIMEDWAIT 1)
+      message(STATUS "timedwait is compilable")
+    endif(HAVE_SEM_TIMEDWAIT_run)
+  endif(HAVE_SEM_TIMEDWAIT_LIB)
+
+  ### HAVE_MUTEX_TIMEDLOCK
+
+  if(HAVE_MUTEX_TIMEDLOCK_LIB)
+
+    execute_process(
+      COMMAND "${CMAKE_C_COMPILER} ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_mutex_timedlock.c -lpthread"
+      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+      OUTPUT_VARIABLE HAVE_MUTEX_TIMEDLOCK_run
+      )
+
+    if(HAVE_MUTEX_TIMEDLOCK_run)
+      set(HAVE_MUTEX_TIMEDLOCK 0)
+      message(STATUS "timedlock not compilable")
+    else(HAVE_MUTEX_TIMEDLOCK_run)
+      message(STATUS "timedlock is compilable")
+      set(HAVE_MUTEX_TIMEDLOCK 1)
+    endif(HAVE_MUTEX_TIMEDLOCK_run)
+  endif(HAVE_MUTEX_TIMEDLOCK_LIB)
 endif(pthread)
 
-# AC_CHECK_MCSC(mcsc=yes, mcsc=no) 
+# AC_CHECK_MCSC(mcsc=yes, mcsc=no)
 set(mcsc_flags "")
 if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
-       set(mcsc_flags "-D_XOPEN_SOURCE")
+  set(mcsc_flags "-D_XOPEN_SOURCE")
 endif(CMAKE_SYSTEM_NAME MATCHES "Darwin")
 
 if(WIN32)
-    if(ARCH_32_BITS)
+  if(ARCH_32_BITS)
     set(mcsc_flags "-D_XBT_WIN32 -D_I_X86_ -I${CMAKE_HOME_DIRECTORY}/include/xbt -I${CMAKE_HOME_DIRECTORY}/src/xbt")
-    else(ARCH_32_BITS)
+  else(ARCH_32_BITS)
     set(mcsc_flags "-D_XBT_WIN32 -D_AMD64_ -I${CMAKE_HOME_DIRECTORY}/include/xbt -I${CMAKE_HOME_DIRECTORY}/src/xbt")
-    endif(ARCH_32_BITS)
+  endif(ARCH_32_BITS)
 endif(WIN32)
 
 IF(CMAKE_CROSSCOMPILING)
-       IF(WIN32)
-               set(windows_context "yes")
-               set(IS_WINDOWS 1)       
-       ENDIF(WIN32)
+  IF(WIN32)
+    set(windows_context "yes")
+    set(IS_WINDOWS 1)
+  ENDIF(WIN32)
 ELSE(CMAKE_CROSSCOMPILING)
-    file(REMOVE "${CMAKE_BINARY_DIR}/testprog*")
-    file(REMOVE ${CMAKE_BINARY_DIR}/conftestval)
-    exec_program(
-                 "${CMAKE_C_COMPILER} ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_AC_CHECK_MCSC.c ${mcsc_flags} -o testprog"
-                 WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/
-                 OUTPUT_VARIABLE COMPILE_mcsc_VAR)
-
-    if(NOT COMPILE_mcsc_VAR)
-        message(STATUS "prog_AC_CHECK_MCSC.c is compilable")
-        exec_program("${CMAKE_BINARY_DIR}/testprog" OUTPUT_VARIABLE var_compil)
-    else(NOT COMPILE_mcsc_VAR)
-        message(STATUS "prog_AC_CHECK_MCSC.c is not compilable")
-    endif(NOT COMPILE_mcsc_VAR)
-    file(REMOVE "${CMAKE_BINARY_DIR}/testprog*")
-    
-       if(EXISTS "${CMAKE_BINARY_DIR}/conftestval")
-               file(READ "${CMAKE_BINARY_DIR}/conftestval" mcsc)
-               STRING(REPLACE "\n" "" mcsc "${mcsc}")
-               if(mcsc)
-                       set(mcsc "yes")
-                       set(HAVE_UCONTEXT_H 1)
-               else(mcsc)
-                       set(mcsc "no")
-               endif(mcsc)
-    else(EXISTS "${CMAKE_BINARY_DIR}/conftestval")
-               set(mcsc "no")
-       endif(EXISTS "${CMAKE_BINARY_DIR}/conftestval")
-       
-       message(STATUS "mcsc: ${mcsc}")   
+  file(REMOVE "${CMAKE_BINARY_DIR}/testprog*")
+  file(REMOVE ${CMAKE_BINARY_DIR}/conftestval)
+  exec_program(
+    "${CMAKE_C_COMPILER} ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_AC_CHECK_MCSC.c ${mcsc_flags} -o testprog"
+    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/
+    OUTPUT_VARIABLE COMPILE_mcsc_VAR)
+
+  if(NOT COMPILE_mcsc_VAR)
+    message(STATUS "prog_AC_CHECK_MCSC.c is compilable")
+    exec_program("${CMAKE_BINARY_DIR}/testprog" OUTPUT_VARIABLE var_compil)
+  else(NOT COMPILE_mcsc_VAR)
+    message(STATUS "prog_AC_CHECK_MCSC.c is not compilable")
+  endif(NOT COMPILE_mcsc_VAR)
+  file(REMOVE "${CMAKE_BINARY_DIR}/testprog*")
+
+  if(EXISTS "${CMAKE_BINARY_DIR}/conftestval")
+    file(READ "${CMAKE_BINARY_DIR}/conftestval" mcsc)
+    STRING(REPLACE "\n" "" mcsc "${mcsc}")
+    if(mcsc)
+      set(mcsc "yes")
+      set(HAVE_UCONTEXT_H 1)
+    else(mcsc)
+      set(mcsc "no")
+    endif(mcsc)
+  else(EXISTS "${CMAKE_BINARY_DIR}/conftestval")
+    set(mcsc "no")
+  endif(EXISTS "${CMAKE_BINARY_DIR}/conftestval")
+
+  message(STATUS "mcsc: ${mcsc}")
 ENDIF(CMAKE_CROSSCOMPILING)
 
 if(mcsc MATCHES "no" AND pthread)
-       if(HAVE_WINDOWS_H)
-               set(windows_context "yes")
-               set(IS_WINDOWS 1)
-       elseif(HAVE_WINDOWS_H)
-               message(FATAL_ERROR "no appropriate backend found")
-       endif(HAVE_WINDOWS_H)
+  if(HAVE_WINDOWS_H)
+    set(windows_context "yes")
+    set(IS_WINDOWS 1)
+  elseif(HAVE_WINDOWS_H)
+    message(FATAL_ERROR "no appropriate backend found")
+  endif(HAVE_WINDOWS_H)
 endif(mcsc MATCHES "no" AND pthread)
 
 #Only windows
 
 if(WIN32)
-       if(NOT HAVE_WINDOWS_H)
-               message(FATAL_ERROR "no appropriate backend found windows")
-       endif(NOT HAVE_WINDOWS_H)
+  if(NOT HAVE_WINDOWS_H)
+    message(FATAL_ERROR "no appropriate backend found windows")
+  endif(NOT HAVE_WINDOWS_H)
 endif(WIN32)
 
 if(windows_context MATCHES "yes")
-       message(STATUS "Context change to windows")
+  message(STATUS "Context change to windows")
 endif(windows_context MATCHES "yes")
 
 #If can have both context
 
 if(mcsc)
-       set(CONTEXT_UCONTEXT 1)
+  set(CONTEXT_UCONTEXT 1)
 endif(mcsc)
 
 if(pthread)
-       set(CONTEXT_THREADS 1)
+  set(CONTEXT_THREADS 1)
 endif(pthread)
 
-
 ###############
 ## GIT version check
 ##
 if(EXISTS ${CMAKE_HOME_DIRECTORY}/.git/ AND NOT WIN32)
-exec_program("git remote | head -n 1" OUTPUT_VARIABLE remote RETURN_VALUE ret)
-exec_program("git config --get remote.${remote}.url" OUTPUT_VARIABLE url RETURN_VALUE ret)
-
-if(url)
-       exec_program("git --git-dir=${CMAKE_HOME_DIRECTORY}/.git log --oneline -1" OUTPUT_VARIABLE "GIT_VERSION")
-       message(STATUS "Git version: ${GIT_VERSION}")
-       exec_program("git --git-dir=${CMAKE_HOME_DIRECTORY}/.git log -n 1 --format=%ai ." OUTPUT_VARIABLE "GIT_DATE")
-       message(STATUS "Git date: ${GIT_DATE}")
-       string(REGEX REPLACE " .*" "" GIT_VERSION "${GIT_VERSION}")
-       STRING(REPLACE " +0000" "" GIT_DATE ${GIT_DATE})
-       STRING(REPLACE " " "~" GIT_DATE ${GIT_DATE})
-       STRING(REPLACE ":" "-" GIT_DATE ${GIT_DATE})
-endif(url)
+  exec_program("git remote | head -n 1" OUTPUT_VARIABLE remote RETURN_VALUE ret)
+  exec_program("git config --get remote.${remote}.url" OUTPUT_VARIABLE url RETURN_VALUE ret)
+
+  if(url)
+    exec_program("git --git-dir=${CMAKE_HOME_DIRECTORY}/.git log --oneline -1" OUTPUT_VARIABLE "GIT_VERSION")
+    message(STATUS "Git version: ${GIT_VERSION}")
+    exec_program("git --git-dir=${CMAKE_HOME_DIRECTORY}/.git log -n 1 --format=%ai ." OUTPUT_VARIABLE "GIT_DATE")
+    message(STATUS "Git date: ${GIT_DATE}")
+    string(REGEX REPLACE " .*" "" GIT_VERSION "${GIT_VERSION}")
+    STRING(REPLACE " +0000" "" GIT_DATE ${GIT_DATE})
+    STRING(REPLACE " " "~" GIT_DATE ${GIT_DATE})
+    STRING(REPLACE ":" "-" GIT_DATE ${GIT_DATE})
+  endif(url)
 endif(EXISTS ${CMAKE_HOME_DIRECTORY}/.git/ AND NOT WIN32)
 
 ###################################
@@ -433,195 +431,195 @@ endif(EXISTS ${CMAKE_HOME_DIRECTORY}/.git/ AND NOT WIN32)
 ##
 
 IF(NOT CMAKE_CROSSCOMPILING)
-# Check architecture signature begin
-try_run(RUN_GRAS_VAR COMPILE_GRAS_VAR
-       ${CMAKE_BINARY_DIR}
-       ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_GRAS_ARCH.c
-       RUN_OUTPUT_VARIABLE var1
-       )
-if(BIGENDIAN)
-  set(val_big "B${var1}")
-  set(GRAS_BIGENDIAN 1)
-else(BIGENDIAN)
-  set(val_big "l${var1}")
-  set(GRAS_BIGENDIAN 0)
-endif(BIGENDIAN)
-
-# The syntax of this magic string is given in src/xbt/datadesc/ddt_convert.c
-# It kinda matches the values that the xbt_arch_desc_t structure can take
-
-# Basically, the syntax is one char l or B for endianness (little or Big)
-#   then there is a bunch of blocks separated by _.  
-# C block is for char, I block for integers, P block for pointers and
-#   D block for floating points
-# For each block there is an amount of chuncks separated by :, each of
-#   them describing a data size. For example there is only one chunk
-#   in the char block, because no architecture provide several sizes
-#   of chars. In integer block, there is 4 chunks: "short int", "int",
-#   "long int", "long long int". There is 2 pointer chunks for data
-#   pointers and pointers on functions (thanks to the AMD64 madness).
-#   Thee two floating points chuncks are for "float" and "double".
-# Each chunk is of the form datasize/minimal_alignment_size
-
-# These informations are used to convert a data stream from one
-#    formalism to another. Only the GRAS_ARCH is transfered in the
-#    stream, and it it of cruxial importance to keep these detection
-#    information here synchronized with the data hardcoded in the
-#    source in src/xbt/datadesc/ddt_convert.c 
-
-# If you add something here (like a previously unknown architecture),
-#    please add it to the source code too. 
-# Please do not modify stuff here since it'd break the GRAS protocol.
-#     If you really need to change stuff, please also bump
-#    GRAS_PROTOCOL_VERSION in src/gras/Msg/msg_interface.h
-
-SET(GRAS_THISARCH "none")
-
-if(val_big MATCHES "l_C:1/1:_I:2/1:4/1:4/1:8/1:_P:4/1:4/1:_D:4/1:8/1:")
-       #gras_arch=0; gras_size=32; gras_arch_name=little32_1;
-       SET(GRAS_ARCH_32_BITS 1)
-       SET(GRAS_THISARCH 0)
-endif(val_big MATCHES "l_C:1/1:_I:2/1:4/1:4/1:8/1:_P:4/1:4/1:_D:4/1:8/1:")
-if(val_big MATCHES "l_C:1/1:_I:2/2:4/2:4/2:8/2:_P:4/2:4/2:_D:4/2:8/2:")
-       #gras_arch=1; gras_size=32; gras_arch_name=little32_2;
-       SET(GRAS_ARCH_32_BITS 1)
-       SET(GRAS_THISARCH 1)
-endif(val_big MATCHES "l_C:1/1:_I:2/2:4/2:4/2:8/2:_P:4/2:4/2:_D:4/2:8/2:")
-if(val_big MATCHES "l_C:1/1:_I:2/2:4/4:4/4:8/4:_P:4/4:4/4:_D:4/4:8/4:") 
-       #gras_arch=2; gras_size=32; gras_arch_name=little32_4;
-       SET(GRAS_ARCH_32_BITS 1)
-       SET(GRAS_THISARCH 2)
-endif(val_big MATCHES "l_C:1/1:_I:2/2:4/4:4/4:8/4:_P:4/4:4/4:_D:4/4:8/4:")
-if(val_big MATCHES "l_C:1/1:_I:2/2:4/4:4/4:8/8:_P:4/4:4/4:_D:4/4:8/8:") 
-       #gras_arch=3; gras_size=32; gras_arch_name=little32_8;
-       SET(GRAS_ARCH_32_BITS 1)
-       SET(GRAS_THISARCH 3)
-endif(val_big MATCHES "l_C:1/1:_I:2/2:4/4:4/4:8/8:_P:4/4:4/4:_D:4/4:8/8:") 
-if(val_big MATCHES "l_C:1/1:_I:2/2:4/4:8/8:8/8:_P:8/8:8/8:_D:4/4:8/8:") 
-       #gras_arch=4; gras_size=64; gras_arch_name=little64;
-       SET(GRAS_ARCH_32_BITS 0)
-       SET(GRAS_THISARCH 4)
-endif(val_big MATCHES "l_C:1/1:_I:2/2:4/4:8/8:8/8:_P:8/8:8/8:_D:4/4:8/8:")
-if(val_big MATCHES "l_C:1/1:_I:2/2:4/4:4/4:8/8:_P:8/8:8/8:_D:4/4:8/8:") 
-       #gras_arch=5; gras_size=64; gras_arch_name=little64_2;
-       SET(GRAS_ARCH_32_BITS 0)
-       SET(GRAS_THISARCH 5)
-endif(val_big MATCHES "l_C:1/1:_I:2/2:4/4:4/4:8/8:_P:8/8:8/8:_D:4/4:8/8:")
-
-if(val_big MATCHES "B_C:1/1:_I:2/2:4/4:4/4:8/8:_P:4/4:4/4:_D:4/4:8/8:") 
-       #gras_arch=6; gras_size=32; gras_arch_name=big32_8;
-       SET(GRAS_ARCH_32_BITS 1)
-       SET(GRAS_THISARCH 6)
-endif(val_big MATCHES "B_C:1/1:_I:2/2:4/4:4/4:8/8:_P:4/4:4/4:_D:4/4:8/8:")
-if(val_big MATCHES "B_C:1/1:_I:2/2:4/4:4/4:8/8:_P:4/4:4/4:_D:4/4:8/4:") 
-       #gras_arch=7; gras_size=32; gras_arch_name=big32_8_4;
-       SET(GRAS_ARCH_32_BITS 1)
-       SET(GRAS_THISARCH 7)
-endif(val_big MATCHES "B_C:1/1:_I:2/2:4/4:4/4:8/8:_P:4/4:4/4:_D:4/4:8/4:")
-if(val_big MATCHES "B_C:1/1:_I:2/2:4/4:4/4:8/4:_P:4/4:4/4:_D:4/4:8/4:") 
-       #gras_arch=8; gras_size=32; gras_arch_name=big32_4;
-       SET(GRAS_ARCH_32_BITS 1)
-       SET(GRAS_THISARCH 8)
-endif(val_big MATCHES "B_C:1/1:_I:2/2:4/4:4/4:8/4:_P:4/4:4/4:_D:4/4:8/4:")
-if(val_big MATCHES "B_C:1/1:_I:2/2:4/2:4/2:8/2:_P:4/2:4/2:_D:4/2:8/2:") 
-       #gras_arch=9; gras_size=32; gras_arch_name=big32_2;
-       SET(GRAS_ARCH_32_BITS 1)
-       SET(GRAS_THISARCH 9)
-endif(val_big MATCHES "B_C:1/1:_I:2/2:4/2:4/2:8/2:_P:4/2:4/2:_D:4/2:8/2:") 
-if(val_big MATCHES "B_C:1/1:_I:2/2:4/4:8/8:8/8:_P:8/8:8/8:_D:4/4:8/8:") 
-       #gras_arch=10; gras_size=64; gras_arch_name=big64;
-       SET(GRAS_ARCH_32_BITS 0)
-       SET(GRAS_THISARCH 10)
-endif(val_big MATCHES "B_C:1/1:_I:2/2:4/4:8/8:8/8:_P:8/8:8/8:_D:4/4:8/8:")
-if(val_big MATCHES "B_C:1/1:_I:2/2:4/4:8/8:8/8:_P:8/8:8/8:_D:4/4:8/4:") 
-       #gras_arch=11; gras_size=64; gras_arch_name=big64_8_4;
-       SET(GRAS_ARCH_32_BITS 0)
-       SET(GRAS_THISARCH 11)
-endif(val_big MATCHES "B_C:1/1:_I:2/2:4/4:8/8:8/8:_P:8/8:8/8:_D:4/4:8/4:") 
-
-if(GRAS_THISARCH MATCHES "none")
+  # Check architecture signature begin
+  try_run(RUN_GRAS_VAR COMPILE_GRAS_VAR
+    ${CMAKE_BINARY_DIR}
+    ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_GRAS_ARCH.c
+    RUN_OUTPUT_VARIABLE var1
+    )
+  if(BIGENDIAN)
+    set(val_big "B${var1}")
+    set(GRAS_BIGENDIAN 1)
+  else(BIGENDIAN)
+    set(val_big "l${var1}")
+    set(GRAS_BIGENDIAN 0)
+  endif(BIGENDIAN)
+
+  # The syntax of this magic string is given in src/xbt/datadesc/ddt_convert.c
+  # It kinda matches the values that the xbt_arch_desc_t structure can take
+
+  # Basically, the syntax is one char l or B for endianness (little or Big)
+  #   then there is a bunch of blocks separated by _.
+  # C block is for char, I block for integers, P block for pointers and
+  #   D block for floating points
+  # For each block there is an amount of chuncks separated by :, each of
+  #   them describing a data size. For example there is only one chunk
+  #   in the char block, because no architecture provide several sizes
+  #   of chars. In integer block, there is 4 chunks: "short int", "int",
+  #   "long int", "long long int". There is 2 pointer chunks for data
+  #   pointers and pointers on functions (thanks to the AMD64 madness).
+  #   Thee two floating points chuncks are for "float" and "double".
+  # Each chunk is of the form datasize/minimal_alignment_size
+
+  # These informations are used to convert a data stream from one
+  #    formalism to another. Only the GRAS_ARCH is transfered in the
+  #    stream, and it it of cruxial importance to keep these detection
+  #    information here synchronized with the data hardcoded in the
+  #    source in src/xbt/datadesc/ddt_convert.c
+
+  # If you add something here (like a previously unknown architecture),
+  #    please add it to the source code too.
+  # Please do not modify stuff here since it'd break the GRAS protocol.
+  #     If you really need to change stuff, please also bump
+  #    GRAS_PROTOCOL_VERSION in src/gras/Msg/msg_interface.h
+
+  SET(GRAS_THISARCH "none")
+
+  if(val_big MATCHES "l_C:1/1:_I:2/1:4/1:4/1:8/1:_P:4/1:4/1:_D:4/1:8/1:")
+    #gras_arch=0; gras_size=32; gras_arch_name=little32_1;
+    SET(GRAS_ARCH_32_BITS 1)
+    SET(GRAS_THISARCH 0)
+  endif(val_big MATCHES "l_C:1/1:_I:2/1:4/1:4/1:8/1:_P:4/1:4/1:_D:4/1:8/1:")
+  if(val_big MATCHES "l_C:1/1:_I:2/2:4/2:4/2:8/2:_P:4/2:4/2:_D:4/2:8/2:")
+    #gras_arch=1; gras_size=32; gras_arch_name=little32_2;
+    SET(GRAS_ARCH_32_BITS 1)
+    SET(GRAS_THISARCH 1)
+  endif(val_big MATCHES "l_C:1/1:_I:2/2:4/2:4/2:8/2:_P:4/2:4/2:_D:4/2:8/2:")
+  if(val_big MATCHES "l_C:1/1:_I:2/2:4/4:4/4:8/4:_P:4/4:4/4:_D:4/4:8/4:")
+    #gras_arch=2; gras_size=32; gras_arch_name=little32_4;
+    SET(GRAS_ARCH_32_BITS 1)
+    SET(GRAS_THISARCH 2)
+  endif(val_big MATCHES "l_C:1/1:_I:2/2:4/4:4/4:8/4:_P:4/4:4/4:_D:4/4:8/4:")
+  if(val_big MATCHES "l_C:1/1:_I:2/2:4/4:4/4:8/8:_P:4/4:4/4:_D:4/4:8/8:")
+    #gras_arch=3; gras_size=32; gras_arch_name=little32_8;
+    SET(GRAS_ARCH_32_BITS 1)
+    SET(GRAS_THISARCH 3)
+  endif(val_big MATCHES "l_C:1/1:_I:2/2:4/4:4/4:8/8:_P:4/4:4/4:_D:4/4:8/8:")
+  if(val_big MATCHES "l_C:1/1:_I:2/2:4/4:8/8:8/8:_P:8/8:8/8:_D:4/4:8/8:")
+    #gras_arch=4; gras_size=64; gras_arch_name=little64;
+    SET(GRAS_ARCH_32_BITS 0)
+    SET(GRAS_THISARCH 4)
+  endif(val_big MATCHES "l_C:1/1:_I:2/2:4/4:8/8:8/8:_P:8/8:8/8:_D:4/4:8/8:")
+  if(val_big MATCHES "l_C:1/1:_I:2/2:4/4:4/4:8/8:_P:8/8:8/8:_D:4/4:8/8:")
+    #gras_arch=5; gras_size=64; gras_arch_name=little64_2;
+    SET(GRAS_ARCH_32_BITS 0)
+    SET(GRAS_THISARCH 5)
+  endif(val_big MATCHES "l_C:1/1:_I:2/2:4/4:4/4:8/8:_P:8/8:8/8:_D:4/4:8/8:")
+
+  if(val_big MATCHES "B_C:1/1:_I:2/2:4/4:4/4:8/8:_P:4/4:4/4:_D:4/4:8/8:")
+    #gras_arch=6; gras_size=32; gras_arch_name=big32_8;
+    SET(GRAS_ARCH_32_BITS 1)
+    SET(GRAS_THISARCH 6)
+  endif(val_big MATCHES "B_C:1/1:_I:2/2:4/4:4/4:8/8:_P:4/4:4/4:_D:4/4:8/8:")
+  if(val_big MATCHES "B_C:1/1:_I:2/2:4/4:4/4:8/8:_P:4/4:4/4:_D:4/4:8/4:")
+    #gras_arch=7; gras_size=32; gras_arch_name=big32_8_4;
+    SET(GRAS_ARCH_32_BITS 1)
+    SET(GRAS_THISARCH 7)
+  endif(val_big MATCHES "B_C:1/1:_I:2/2:4/4:4/4:8/8:_P:4/4:4/4:_D:4/4:8/4:")
+  if(val_big MATCHES "B_C:1/1:_I:2/2:4/4:4/4:8/4:_P:4/4:4/4:_D:4/4:8/4:")
+    #gras_arch=8; gras_size=32; gras_arch_name=big32_4;
+    SET(GRAS_ARCH_32_BITS 1)
+    SET(GRAS_THISARCH 8)
+  endif(val_big MATCHES "B_C:1/1:_I:2/2:4/4:4/4:8/4:_P:4/4:4/4:_D:4/4:8/4:")
+  if(val_big MATCHES "B_C:1/1:_I:2/2:4/2:4/2:8/2:_P:4/2:4/2:_D:4/2:8/2:")
+    #gras_arch=9; gras_size=32; gras_arch_name=big32_2;
+    SET(GRAS_ARCH_32_BITS 1)
+    SET(GRAS_THISARCH 9)
+  endif(val_big MATCHES "B_C:1/1:_I:2/2:4/2:4/2:8/2:_P:4/2:4/2:_D:4/2:8/2:")
+  if(val_big MATCHES "B_C:1/1:_I:2/2:4/4:8/8:8/8:_P:8/8:8/8:_D:4/4:8/8:")
+    #gras_arch=10; gras_size=64; gras_arch_name=big64;
+    SET(GRAS_ARCH_32_BITS 0)
+    SET(GRAS_THISARCH 10)
+  endif(val_big MATCHES "B_C:1/1:_I:2/2:4/4:8/8:8/8:_P:8/8:8/8:_D:4/4:8/8:")
+  if(val_big MATCHES "B_C:1/1:_I:2/2:4/4:8/8:8/8:_P:8/8:8/8:_D:4/4:8/4:")
+    #gras_arch=11; gras_size=64; gras_arch_name=big64_8_4;
+    SET(GRAS_ARCH_32_BITS 0)
+    SET(GRAS_THISARCH 11)
+  endif(val_big MATCHES "B_C:1/1:_I:2/2:4/4:8/8:8/8:_P:8/8:8/8:_D:4/4:8/4:")
+
+  if(GRAS_THISARCH MATCHES "none")
     message(STATUS "architecture: ${val_big}")
-    message(FATAL_ERROR "GRAS_THISARCH is empty: '${GRAS_THISARCH}'")  
-endif(GRAS_THISARCH MATCHES "none")
-
-# Check architecture signature end
-try_run(RUN_GRAS_VAR COMPILE_GRAS_VAR
-       ${CMAKE_BINARY_DIR}
-       ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_GRAS_CHECK_STRUCT_COMPACTION.c
-       RUN_OUTPUT_VARIABLE var2
-       )
-separate_arguments(var2)
-foreach(var_tmp ${var2})
-       set(${var_tmp} 1)
-endforeach(var_tmp ${var2})
-
-# Check for [SIZEOF_MAX]
-try_run(RUN_SM_VAR COMPILE_SM_VAR
-       ${CMAKE_BINARY_DIR}
-       ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_max_size.c
-       RUN_OUTPUT_VARIABLE var3
-       )
-message(STATUS "SIZEOF_MAX ${var3}")
-SET(SIZEOF_MAX ${var3})
+    message(FATAL_ERROR "GRAS_THISARCH is empty: '${GRAS_THISARCH}'")
+  endif(GRAS_THISARCH MATCHES "none")
+
+  # Check architecture signature end
+  try_run(RUN_GRAS_VAR COMPILE_GRAS_VAR
+    ${CMAKE_BINARY_DIR}
+    ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_GRAS_CHECK_STRUCT_COMPACTION.c
+    RUN_OUTPUT_VARIABLE var2
+    )
+  separate_arguments(var2)
+  foreach(var_tmp ${var2})
+    set(${var_tmp} 1)
+  endforeach(var_tmp ${var2})
+
+  # Check for [SIZEOF_MAX]
+  try_run(RUN_SM_VAR COMPILE_SM_VAR
+    ${CMAKE_BINARY_DIR}
+    ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_max_size.c
+    RUN_OUTPUT_VARIABLE var3
+    )
+  message(STATUS "SIZEOF_MAX ${var3}")
+  SET(SIZEOF_MAX ${var3})
 ENDIF(NOT CMAKE_CROSSCOMPILING)
 
 #--------------------------------------------------------------------------------------------------
 
 set(makecontext_CPPFLAGS_2 "")
 if(HAVE_MAKECONTEXT OR WIN32)
-       set(makecontext_CPPFLAGS "-DTEST_makecontext")
-       if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
-               set(makecontext_CPPFLAGS_2 "-D_XOPEN_SOURCE")
-       endif(CMAKE_SYSTEM_NAME MATCHES "Darwin")
-       
-    if(WIN32)
-        if(ARCH_32_BITS)
-           set(makecontext_CPPFLAGS "-DTEST_makecontext -D_I_X86_")
-           else(ARCH_32_BITS)
-           set(makecontext_CPPFLAGS "-DTEST_makecontext -D_AMD64_")
-           endif(ARCH_32_BITS)
-           set(makecontext_CPPFLAGS_2 "-D_XBT_WIN32 -I${CMAKE_HOME_DIRECTORY}/include/xbt -I${CMAKE_HOME_DIRECTORY}/src/xbt")
-       endif(WIN32)
-
-    file(REMOVE ${CMAKE_BINARY_DIR}/conftestval)
-       
-       try_run(RUN_makecontext_VAR COMPILE_makecontext_VAR
-               ${CMAKE_BINARY_DIR}
-               ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_stacksetup.c
-               COMPILE_DEFINITIONS "${makecontext_CPPFLAGS} ${makecontext_CPPFLAGS_2}"
-               )
-
-    if(EXISTS ${CMAKE_BINARY_DIR}/conftestval)
-       file(READ ${CMAKE_BINARY_DIR}/conftestval MAKECONTEXT_ADDR_SIZE)
-       string(REPLACE "\n" "" MAKECONTEXT_ADDR_SIZE "${MAKECONTEXT_ADDR_SIZE}")
-       string(REGEX MATCH ;^.*,;MAKECONTEXT_ADDR "${MAKECONTEXT_ADDR_SIZE}")
-       string(REGEX MATCH ;,.*$; MAKECONTEXT_SIZE "${MAKECONTEXT_ADDR_SIZE}")
-       string(REPLACE "," "" makecontext_addr "${MAKECONTEXT_ADDR}")
-       string(REPLACE "," "" makecontext_size "${MAKECONTEXT_SIZE}")   
-       set(pth_skaddr_makecontext "#define pth_skaddr_makecontext(skaddr,sksize) (${makecontext_addr})")
-       set(pth_sksize_makecontext "#define pth_sksize_makecontext(skaddr,sksize) (${makecontext_size})")
-       message(STATUS "${pth_skaddr_makecontext}")
-       message(STATUS "${pth_sksize_makecontext}")
-       else(EXISTS ${CMAKE_BINARY_DIR}/conftestval)
-#          message(FATAL_ERROR "makecontext is not compilable")
-       endif(EXISTS ${CMAKE_BINARY_DIR}/conftestval)
+  set(makecontext_CPPFLAGS "-DTEST_makecontext")
+  if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
+    set(makecontext_CPPFLAGS_2 "-D_XOPEN_SOURCE")
+  endif(CMAKE_SYSTEM_NAME MATCHES "Darwin")
+
+  if(WIN32)
+    if(ARCH_32_BITS)
+      set(makecontext_CPPFLAGS "-DTEST_makecontext -D_I_X86_")
+    else(ARCH_32_BITS)
+      set(makecontext_CPPFLAGS "-DTEST_makecontext -D_AMD64_")
+    endif(ARCH_32_BITS)
+    set(makecontext_CPPFLAGS_2 "-D_XBT_WIN32 -I${CMAKE_HOME_DIRECTORY}/include/xbt -I${CMAKE_HOME_DIRECTORY}/src/xbt")
+  endif(WIN32)
+
+  file(REMOVE ${CMAKE_BINARY_DIR}/conftestval)
+
+  try_run(RUN_makecontext_VAR COMPILE_makecontext_VAR
+    ${CMAKE_BINARY_DIR}
+    ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_stacksetup.c
+    COMPILE_DEFINITIONS "${makecontext_CPPFLAGS} ${makecontext_CPPFLAGS_2}"
+    )
+
+  if(EXISTS ${CMAKE_BINARY_DIR}/conftestval)
+    file(READ ${CMAKE_BINARY_DIR}/conftestval MAKECONTEXT_ADDR_SIZE)
+    string(REPLACE "\n" "" MAKECONTEXT_ADDR_SIZE "${MAKECONTEXT_ADDR_SIZE}")
+    string(REGEX MATCH ;^.*,;MAKECONTEXT_ADDR "${MAKECONTEXT_ADDR_SIZE}")
+    string(REGEX MATCH ;,.*$; MAKECONTEXT_SIZE "${MAKECONTEXT_ADDR_SIZE}")
+    string(REPLACE "," "" makecontext_addr "${MAKECONTEXT_ADDR}")
+    string(REPLACE "," "" makecontext_size "${MAKECONTEXT_SIZE}")
+    set(pth_skaddr_makecontext "#define pth_skaddr_makecontext(skaddr,sksize) (${makecontext_addr})")
+    set(pth_sksize_makecontext "#define pth_sksize_makecontext(skaddr,sksize) (${makecontext_size})")
+    message(STATUS "${pth_skaddr_makecontext}")
+    message(STATUS "${pth_sksize_makecontext}")
+  else(EXISTS ${CMAKE_BINARY_DIR}/conftestval)
+    #      message(FATAL_ERROR "makecontext is not compilable")
+  endif(EXISTS ${CMAKE_BINARY_DIR}/conftestval)
 endif(HAVE_MAKECONTEXT OR WIN32)
 
 #--------------------------------------------------------------------------------------------------
 
 ### check for stackgrowth
 if (NOT CMAKE_CROSSCOMPILING)
-       try_run(RUN_makecontext_VAR COMPILE_makecontext_VAR
-               ${CMAKE_BINARY_DIR}
-               ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_stackgrowth.c
-               )
-file(READ "${CMAKE_BINARY_DIR}/conftestval" stack)
-if(stack MATCHES "down")
-       set(PTH_STACKGROWTH "-1")
-endif(stack MATCHES "down")
-if(stack MATCHES "up")
-       set(PTH_STACKGROWTH "1")
-endif(stack MATCHES "up")
+  try_run(RUN_makecontext_VAR COMPILE_makecontext_VAR
+    ${CMAKE_BINARY_DIR}
+    ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_stackgrowth.c
+    )
+  file(READ "${CMAKE_BINARY_DIR}/conftestval" stack)
+  if(stack MATCHES "down")
+    set(PTH_STACKGROWTH "-1")
+  endif(stack MATCHES "down")
+  if(stack MATCHES "up")
+    set(PTH_STACKGROWTH "1")
+  endif(stack MATCHES "up")
 
 endif(NOT CMAKE_CROSSCOMPILING)
 ###############
@@ -634,33 +632,32 @@ endif(NOT CMAKE_CROSSCOMPILING)
 
 #AC_PROG_MAKE_SET
 
-
 #AC_PRINTF_NULL
 try_run(RUN_PRINTF_NULL_VAR COMPILE_PRINTF_NULL_VAR
-       ${CMAKE_BINARY_DIR}
-       ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_printf_null.c
-       )
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_printf_null.c
+  )
 
 if(RUN_PRINTF_NULL_VAR MATCHES "FAILED_TO_RUN")
-SET(PRINTF_NULL_WORKING "0")
+  SET(PRINTF_NULL_WORKING "0")
 else(RUN_PRINTF_NULL_VAR MATCHES "FAILED_TO_RUN")
-SET(PRINTF_NULL_WORKING "1")
+  SET(PRINTF_NULL_WORKING "1")
 endif(RUN_PRINTF_NULL_VAR MATCHES "FAILED_TO_RUN")
 
 #AC_CHECK_VA_COPY
 
 set(diff_va "va_copy((d),(s))"
-"VA_COPY((d),(s))"
-"__va_copy((d),(s))"
-"__builtin_va_copy((d),(s))"
-"do { (d) = (s)\; } while (0)"
-"do { *(d) = *(s)\; } while (0)"
-"memcpy((void *)&(d), (void *)&(s), sizeof(s))"
-"memcpy((void *)(d), (void *)(s), sizeof(*(s)))"
-)
+  "VA_COPY((d),(s))"
+  "__va_copy((d),(s))"
+  "__builtin_va_copy((d),(s))"
+  "do { (d) = (s)\; } while (0)"
+  "do { *(d) = *(s)\; } while (0)"
+  "memcpy((void *)&(d), (void *)&(s), sizeof(s))"
+  "memcpy((void *)(d), (void *)(s), sizeof(*(s)))"
+  )
 
 foreach(fct ${diff_va})
-       write_file("${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_va_copy.c" "#include <stdlib.h>
+  write_file("${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_va_copy.c" "#include <stdlib.h>
        #include <stdarg.h>
        #include <string.h>
        #define DO_VA_COPY(d,s) ${fct}
@@ -688,146 +685,144 @@ foreach(fct ${diff_va})
            test(\"test\", 1, 2, 3, 4, 5, 6, 7, 8, 9);
            exit(0);
        }"
-       )
-       try_compile(COMPILE_VA_NULL_VAR
-       ${CMAKE_BINARY_DIR}
-       ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_va_copy.c
-       )
-       if(COMPILE_VA_NULL_VAR)
-               string(REGEX REPLACE "\;" "" fctbis ${fct})
-               if(${fctbis} STREQUAL "va_copy((d),(s))")
-                       set(HAVE_VA_COPY 1)
-                       set(ac_cv_va_copy "C99")
-                       set(__VA_COPY_USE_C99 "va_copy((d),(s))")       
-               endif(${fctbis} STREQUAL "va_copy((d),(s))")
-
-               if(${fctbis} STREQUAL "VA_COPY((d),(s))")
-                       set(ac_cv_va_copy "GCM")
-                       set(__VA_COPY_USE_GCM "VA_COPY((d),(s))")
-               endif(${fctbis} STREQUAL "VA_COPY((d),(s))")
-
-               if(${fctbis} STREQUAL "__va_copy((d),(s))")
-                       set(ac_cv_va_copy "GCH")
-                       set(__VA_COPY_USE_GCH "__va_copy((d),(s))")
-               endif(${fctbis} STREQUAL "__va_copy((d),(s))")
-
-               if(${fctbis} STREQUAL "__builtin_va_copy((d),(s))")
-                       set(ac_cv_va_copy "GCB")
-                       set(__VA_COPY_USE_GCB "__builtin_va_copy((d),(s))")
-               endif(${fctbis} STREQUAL "__builtin_va_copy((d),(s))")
-
-               if(${fctbis} STREQUAL "do { (d) = (s) } while (0)")
-                       set(ac_cv_va_copy "ASS")
-                       set(__VA_COPY_USE_ASS "do { (d) = (s); } while (0)")
-               endif(${fctbis} STREQUAL "do { (d) = (s) } while (0)")
-
-               if(${fctbis} STREQUAL "do { *(d) = *(s) } while (0)")
-                       set(ac_cv_va_copy "ASP")
-                       set(__VA_COPY_USE_ASP "do { *(d) = *(s); } while (0)")
-               endif(${fctbis} STREQUAL "do { *(d) = *(s) } while (0)")
-
-               if(${fctbis} STREQUAL "memcpy((void *)&(d), (void *)&(s), sizeof(s))")
-                       set(ac_cv_va_copy "CPS")
-                       set(__VA_COPY_USE_CPS "memcpy((void *)&(d), (void *)&(s), sizeof(s))")
-               endif(${fctbis} STREQUAL "memcpy((void *)&(d), (void *)&(s), sizeof(s))")
-
-               if(${fctbis} STREQUAL "memcpy((void *)(d), (void *)(s), sizeof(*(s)))")
-                       set(ac_cv_va_copy "CPP")
-                       set(__VA_COPY_USE_CPP "memcpy((void *)(d), (void *)(s), sizeof(*(s)))")
-               endif(${fctbis} STREQUAL "memcpy((void *)(d), (void *)(s), sizeof(*(s)))")
-                               
-               if(NOT STATUS_OK)
-               set(__VA_COPY_USE "__VA_COPY_USE_${ac_cv_va_copy}(d, s)")
-               endif(NOT STATUS_OK)
-               set(STATUS_OK "1")
-               
-       endif(COMPILE_VA_NULL_VAR)
-       
+    )
+  try_compile(COMPILE_VA_NULL_VAR
+    ${CMAKE_BINARY_DIR}
+    ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_va_copy.c
+    )
+  if(COMPILE_VA_NULL_VAR)
+    string(REGEX REPLACE "\;" "" fctbis ${fct})
+    if(${fctbis} STREQUAL "va_copy((d),(s))")
+      set(HAVE_VA_COPY 1)
+      set(ac_cv_va_copy "C99")
+      set(__VA_COPY_USE_C99 "va_copy((d),(s))")
+    endif(${fctbis} STREQUAL "va_copy((d),(s))")
+
+    if(${fctbis} STREQUAL "VA_COPY((d),(s))")
+      set(ac_cv_va_copy "GCM")
+      set(__VA_COPY_USE_GCM "VA_COPY((d),(s))")
+    endif(${fctbis} STREQUAL "VA_COPY((d),(s))")
+
+    if(${fctbis} STREQUAL "__va_copy((d),(s))")
+      set(ac_cv_va_copy "GCH")
+      set(__VA_COPY_USE_GCH "__va_copy((d),(s))")
+    endif(${fctbis} STREQUAL "__va_copy((d),(s))")
+
+    if(${fctbis} STREQUAL "__builtin_va_copy((d),(s))")
+      set(ac_cv_va_copy "GCB")
+      set(__VA_COPY_USE_GCB "__builtin_va_copy((d),(s))")
+    endif(${fctbis} STREQUAL "__builtin_va_copy((d),(s))")
+
+    if(${fctbis} STREQUAL "do { (d) = (s) } while (0)")
+      set(ac_cv_va_copy "ASS")
+      set(__VA_COPY_USE_ASS "do { (d) = (s); } while (0)")
+    endif(${fctbis} STREQUAL "do { (d) = (s) } while (0)")
+
+    if(${fctbis} STREQUAL "do { *(d) = *(s) } while (0)")
+      set(ac_cv_va_copy "ASP")
+      set(__VA_COPY_USE_ASP "do { *(d) = *(s); } while (0)")
+    endif(${fctbis} STREQUAL "do { *(d) = *(s) } while (0)")
+
+    if(${fctbis} STREQUAL "memcpy((void *)&(d), (void *)&(s), sizeof(s))")
+      set(ac_cv_va_copy "CPS")
+      set(__VA_COPY_USE_CPS "memcpy((void *)&(d), (void *)&(s), sizeof(s))")
+    endif(${fctbis} STREQUAL "memcpy((void *)&(d), (void *)&(s), sizeof(s))")
+
+    if(${fctbis} STREQUAL "memcpy((void *)(d), (void *)(s), sizeof(*(s)))")
+      set(ac_cv_va_copy "CPP")
+      set(__VA_COPY_USE_CPP "memcpy((void *)(d), (void *)(s), sizeof(*(s)))")
+    endif(${fctbis} STREQUAL "memcpy((void *)(d), (void *)(s), sizeof(*(s)))")
+
+    if(NOT STATUS_OK)
+      set(__VA_COPY_USE "__VA_COPY_USE_${ac_cv_va_copy}(d, s)")
+    endif(NOT STATUS_OK)
+    set(STATUS_OK "1")
+
+  endif(COMPILE_VA_NULL_VAR)
+
 endforeach(fct ${diff_va})
 
 #--------------------------------------------------------------------------------------------------
 ### check for getline
 try_compile(COMPILE_RESULT_VAR
-       ${CMAKE_BINARY_DIR}
-       ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_getline.c
-       )
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_getline.c
+  )
 
 if(NOT COMPILE_RESULT_VAR)
-SET(need_getline "#define SIMGRID_NEED_GETLINE 1")
-SET(SIMGRID_NEED_GETLINE 1)
+  SET(need_getline "#define SIMGRID_NEED_GETLINE 1")
+  SET(SIMGRID_NEED_GETLINE 1)
 else(NOT COMPILE_RESULT_VAR)
-SET(need_getline "")
-SET(SIMGRID_NEED_GETLINE 0)
+  SET(need_getline "")
+  SET(SIMGRID_NEED_GETLINE 0)
 endif(NOT COMPILE_RESULT_VAR)
 
 ### check for a working snprintf
 if(HAVE_SNPRINTF AND HAVE_VSNPRINTF OR WIN32)
-    if(WIN32)
-        #set(HAVE_SNPRINTF 1)
-        #set(HAVE_VSNPRINTF 1)
-    endif(WIN32)
-    
-       if(CMAKE_CROSSCOMPILING)
-               set(RUN_SNPRINTF_FUNC "cross")
-               #set(PREFER_PORTABLE_SNPRINTF 1)
-       else(CMAKE_CROSSCOMPILING)
-           try_run(RUN_SNPRINTF_FUNC_VAR COMPILE_SNPRINTF_FUNC_VAR
-               ${CMAKE_BINARY_DIR}
-               ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_snprintf.c
-           )   
-       endif(CMAKE_CROSSCOMPILING)
-
-       if(CMAKE_CROSSCOMPILING)
-               set(RUN_VSNPRINTF_FUNC "cross")
-               set(PREFER_PORTABLE_VSNPRINTF 1)
-       else(CMAKE_CROSSCOMPILING)
-          try_run(RUN_VSNPRINTF_FUNC_VAR COMPILE_VSNPRINTF_FUNC_VAR
-               ${CMAKE_BINARY_DIR}
-               ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_vsnprintf.c
-          )
-       endif(CMAKE_CROSSCOMPILING)
-       
-       set(PREFER_PORTABLE_SNPRINTF 0)
-       if(RUN_VSNPRINTF_FUNC_VAR MATCHES "FAILED_TO_RUN")
-               set(PREFER_PORTABLE_SNPRINTF 1)
-       endif(RUN_VSNPRINTF_FUNC_VAR MATCHES "FAILED_TO_RUN")
-       if(RUN_SNPRINTF_FUNC_VAR MATCHES "FAILED_TO_RUN")
-               set(PREFER_PORTABLE_SNPRINTF 1)
-       endif(RUN_SNPRINTF_FUNC_VAR MATCHES "FAILED_TO_RUN")
+  if(WIN32)
+    #set(HAVE_SNPRINTF 1)
+    #set(HAVE_VSNPRINTF 1)
+  endif(WIN32)
+
+  if(CMAKE_CROSSCOMPILING)
+    set(RUN_SNPRINTF_FUNC "cross")
+    #set(PREFER_PORTABLE_SNPRINTF 1)
+  else(CMAKE_CROSSCOMPILING)
+    try_run(RUN_SNPRINTF_FUNC_VAR COMPILE_SNPRINTF_FUNC_VAR
+      ${CMAKE_BINARY_DIR}
+      ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_snprintf.c
+      )
+  endif(CMAKE_CROSSCOMPILING)
+
+  if(CMAKE_CROSSCOMPILING)
+    set(RUN_VSNPRINTF_FUNC "cross")
+    set(PREFER_PORTABLE_VSNPRINTF 1)
+  else(CMAKE_CROSSCOMPILING)
+    try_run(RUN_VSNPRINTF_FUNC_VAR COMPILE_VSNPRINTF_FUNC_VAR
+      ${CMAKE_BINARY_DIR}
+      ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_vsnprintf.c
+      )
+  endif(CMAKE_CROSSCOMPILING)
+
+  set(PREFER_PORTABLE_SNPRINTF 0)
+  if(RUN_VSNPRINTF_FUNC_VAR MATCHES "FAILED_TO_RUN")
+    set(PREFER_PORTABLE_SNPRINTF 1)
+  endif(RUN_VSNPRINTF_FUNC_VAR MATCHES "FAILED_TO_RUN")
+  if(RUN_SNPRINTF_FUNC_VAR MATCHES "FAILED_TO_RUN")
+    set(PREFER_PORTABLE_SNPRINTF 1)
+  endif(RUN_SNPRINTF_FUNC_VAR MATCHES "FAILED_TO_RUN")
 endif(HAVE_SNPRINTF AND HAVE_VSNPRINTF OR WIN32)
 
 ### check for asprintf function familly
 if(HAVE_ASPRINTF)
-       SET(simgrid_need_asprintf "")
-       SET(NEED_ASPRINTF 0)
+  SET(simgrid_need_asprintf "")
+  SET(NEED_ASPRINTF 0)
 else(HAVE_ASPRINTF)
-       SET(simgrid_need_asprintf "#define SIMGRID_NEED_ASPRINTF 1")
-       SET(NEED_ASPRINTF 1)
+  SET(simgrid_need_asprintf "#define SIMGRID_NEED_ASPRINTF 1")
+  SET(NEED_ASPRINTF 1)
 endif(HAVE_ASPRINTF)
 
 if(HAVE_VASPRINTF)
-       SET(simgrid_need_vasprintf "")
-       SET(NEED_VASPRINTF 0)
+  SET(simgrid_need_vasprintf "")
+  SET(NEED_VASPRINTF 0)
 else(HAVE_VASPRINTF)
-       SET(simgrid_need_vasprintf "#define SIMGRID_NEED_VASPRINTF 1")
-       SET(NEED_VASPRINTF 1)
+  SET(simgrid_need_vasprintf "#define SIMGRID_NEED_VASPRINTF 1")
+  SET(NEED_VASPRINTF 1)
 endif(HAVE_VASPRINTF)
 
 ### check for addr2line
 
 find_path(ADDR2LINE NAMES addr2line    PATHS NO_DEFAULT_PATHS  )
 if(ADDR2LINE)
-set(ADDR2LINE "${ADDR2LINE}/addr2line")
+  set(ADDR2LINE "${ADDR2LINE}/addr2line")
 endif(ADDR2LINE)
 
-
-
 ### Check if OSX can compile with ucontext (with gcc 4.[1-5] it is broken)
 if(APPLE)
-    if(APPLE_NEED_GCC_VERSION GREATER COMPILER_C_VERSION_MAJOR_MINOR)
-        message(STATUS "Ucontext can't be used with this version of gcc (must be greater than 4.5)")
-        set(HAVE_UCONTEXT_H 0)
-    endif(APPLE_NEED_GCC_VERSION GREATER COMPILER_C_VERSION_MAJOR_MINOR)
+  if(APPLE_NEED_GCC_VERSION GREATER COMPILER_C_VERSION_MAJOR_MINOR)
+    message(STATUS "Ucontext can't be used with this version of gcc (must be greater than 4.5)")
+    set(HAVE_UCONTEXT_H 0)
+  endif(APPLE_NEED_GCC_VERSION GREATER COMPILER_C_VERSION_MAJOR_MINOR)
 endif(APPLE)
 
 ### File to create
@@ -856,60 +851,59 @@ configure_file(${CMAKE_HOME_DIRECTORY}/src/smpi/smpiff.in ${CMAKE_BINARY_DIR}/bi
 configure_file(${CMAKE_HOME_DIRECTORY}/src/smpi/smpirun.in ${CMAKE_BINARY_DIR}/bin/smpirun @ONLY)
 
 if(NOT WIN32)
-exec_program("chmod a=rwx ${CMAKE_BINARY_DIR}/bin/smpicc" OUTPUT_VARIABLE OKITOKI)
-exec_program("chmod a=rwx ${CMAKE_BINARY_DIR}/bin/smpif2c" OUTPUT_VARIABLE OKITOKI)
-exec_program("chmod a=rwx ${CMAKE_BINARY_DIR}/bin/smpiff" OUTPUT_VARIABLE OKITOKI)
-exec_program("chmod a=rwx ${CMAKE_BINARY_DIR}/bin/smpirun" OUTPUT_VARIABLE OKITOKI)
+  exec_program("chmod a=rwx ${CMAKE_BINARY_DIR}/bin/smpicc" OUTPUT_VARIABLE OKITOKI)
+  exec_program("chmod a=rwx ${CMAKE_BINARY_DIR}/bin/smpif2c" OUTPUT_VARIABLE OKITOKI)
+  exec_program("chmod a=rwx ${CMAKE_BINARY_DIR}/bin/smpiff" OUTPUT_VARIABLE OKITOKI)
+  exec_program("chmod a=rwx ${CMAKE_BINARY_DIR}/bin/smpirun" OUTPUT_VARIABLE OKITOKI)
 endif(NOT WIN32)
 
 set(generated_headers_to_install
-       ${CMAKE_CURRENT_BINARY_DIR}/include/smpi/smpif.h
-       ${CMAKE_CURRENT_BINARY_DIR}/include/simgrid_config.h
-)
+  ${CMAKE_CURRENT_BINARY_DIR}/include/smpi/smpif.h
+  ${CMAKE_CURRENT_BINARY_DIR}/include/simgrid_config.h
+  )
 
 set(generated_headers
-    ${CMAKE_CURRENT_BINARY_DIR}/src/context_sysv_config.h
-    ${CMAKE_CURRENT_BINARY_DIR}/src/gras_config.h
-)
+  ${CMAKE_CURRENT_BINARY_DIR}/src/context_sysv_config.h
+  ${CMAKE_CURRENT_BINARY_DIR}/src/gras_config.h
+  )
 
 set(generated_files_to_clean
-${generated_headers}
-${generated_headers_to_install}
-${CMAKE_BINARY_DIR}/bin/smpicc
-${CMAKE_BINARY_DIR}/bin/smpif2c
-${CMAKE_BINARY_DIR}/bin/smpiff
-${CMAKE_BINARY_DIR}/bin/smpirun
-${CMAKE_BINARY_DIR}/bin/colorize
-${CMAKE_BINARY_DIR}/bin/simgrid_update_xml
-${CMAKE_BINARY_DIR}/examples/smpi/tracing/smpi_traced.trace
-${CMAKE_BINARY_DIR}/src/supernovae_sg.c
-${CMAKE_BINARY_DIR}/src/supernovae_gras.c
-${CMAKE_BINARY_DIR}/src/supernovae_smpi.c
-)
+  ${generated_headers}
+  ${generated_headers_to_install}
+  ${CMAKE_BINARY_DIR}/bin/smpicc
+  ${CMAKE_BINARY_DIR}/bin/smpif2c
+  ${CMAKE_BINARY_DIR}/bin/smpiff
+  ${CMAKE_BINARY_DIR}/bin/smpirun
+  ${CMAKE_BINARY_DIR}/bin/colorize
+  ${CMAKE_BINARY_DIR}/bin/simgrid_update_xml
+  ${CMAKE_BINARY_DIR}/examples/smpi/tracing/smpi_traced.trace
+  ${CMAKE_BINARY_DIR}/src/supernovae_sg.c
+  ${CMAKE_BINARY_DIR}/src/supernovae_gras.c
+  ${CMAKE_BINARY_DIR}/src/supernovae_smpi.c
+  )
 
 if("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_HOME_DIRECTORY}")
 else("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_HOME_DIRECTORY}")
-       configure_file(${CMAKE_HOME_DIRECTORY}/examples/smpi/hostfile ${CMAKE_BINARY_DIR}/examples/smpi/hostfile COPYONLY)
-       configure_file(${CMAKE_HOME_DIRECTORY}/examples/msg/small_platform.xml ${CMAKE_BINARY_DIR}/examples/msg/small_platform.xml COPYONLY)
-       configure_file(${CMAKE_HOME_DIRECTORY}/examples/msg/small_platform_with_routers.xml ${CMAKE_BINARY_DIR}/examples/msg/small_platform_with_routers.xml COPYONLY)
-       configure_file(${CMAKE_HOME_DIRECTORY}/examples/msg/tracing/platform.xml ${CMAKE_BINARY_DIR}/examples/msg/tracing/platform.xml COPYONLY)
-       
-       set(generated_files_to_clean
-               ${generated_files_to_clean}
-               ${CMAKE_BINARY_DIR}/examples/smpi/hostfile
-               ${CMAKE_BINARY_DIR}/examples/msg/small_platform.xml
-               ${CMAKE_BINARY_DIR}/examples/msg/small_platform_with_routers.xml
-               ${CMAKE_BINARY_DIR}/examples/msg/tracing/platform.xml
-               )
+  configure_file(${CMAKE_HOME_DIRECTORY}/examples/smpi/hostfile ${CMAKE_BINARY_DIR}/examples/smpi/hostfile COPYONLY)
+  configure_file(${CMAKE_HOME_DIRECTORY}/examples/msg/small_platform.xml ${CMAKE_BINARY_DIR}/examples/msg/small_platform.xml COPYONLY)
+  configure_file(${CMAKE_HOME_DIRECTORY}/examples/msg/small_platform_with_routers.xml ${CMAKE_BINARY_DIR}/examples/msg/small_platform_with_routers.xml COPYONLY)
+  configure_file(${CMAKE_HOME_DIRECTORY}/examples/msg/tracing/platform.xml ${CMAKE_BINARY_DIR}/examples/msg/tracing/platform.xml COPYONLY)
+
+  set(generated_files_to_clean
+    ${generated_files_to_clean}
+    ${CMAKE_BINARY_DIR}/examples/smpi/hostfile
+    ${CMAKE_BINARY_DIR}/examples/msg/small_platform.xml
+    ${CMAKE_BINARY_DIR}/examples/msg/small_platform_with_routers.xml
+    ${CMAKE_BINARY_DIR}/examples/msg/tracing/platform.xml
+    )
 endif("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_HOME_DIRECTORY}")
 
 SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES
-"${generated_files_to_clean}")
-
+  "${generated_files_to_clean}")
 
 IF(${ARCH_32_BITS})
   set(WIN_ARCH "32")
 ELSE(${ARCH_32_BITS})
-    set(WIN_ARCH "64")
+  set(WIN_ARCH "64")
 ENDIF(${ARCH_32_BITS})
 configure_file("${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/src/simgrid.nsi.in"   "${CMAKE_BINARY_DIR}/simgrid.nsi" @ONLY IMMEDIATE)
index fb0eaa3..bc69087 100644 (file)
@@ -1,6 +1,6 @@
 ### define source packages
 
-set(EXTRA_DIST 
+set(EXTRA_DIST
   src/portable.h
   src/xbt/mallocator_private.h
   src/xbt/dict_private.h
@@ -88,27 +88,27 @@ set(EXTRA_DIST
   src/smpi/smpi_mpi_dt_private.h
   src/smpi/README
   src/mk_supernovae.pl
-  
+
   tools/gras/gras_stub_generator.h
-  tools/tesh/run_context.h  
+  tools/tesh/run_context.h
   tools/tesh/tesh.h
-  
+
   src/surf/network_ns3_private.h
   src/surf/ns3/ns3_interface.h
   src/surf/ns3/ns3_simulator.h
   src/surf/ns3/my-point-to-point-helper.h
   src/surf/ns3/red-queue.h
-)
+  )
 
-set(XBT_RL_SRC 
+set(XBT_RL_SRC
   src/xbt/xbt_rl_synchro.c
   src/xbt/xbt_rl_time.c
-)
+  )
 
-set(XBT_SG_SRC 
+set(XBT_SG_SRC
   src/xbt/xbt_sg_synchro.c
   src/xbt/xbt_sg_time.c
-)     
+  )
 
 set(SMPI_SRC
   src/smpi/smpi_base.c
@@ -122,8 +122,7 @@ set(SMPI_SRC
   src/smpi/smpi_group.c
   src/smpi/smpi_coll.c
   src/smpi/smpi_mpi_dt.c
-)
-
+  )
 
 set(GRAS_RL_SRC
   src/gras/rl_stubs.c
@@ -134,9 +133,9 @@ set(GRAS_RL_SRC
   src/gras/Virtu/rl_dns.c
   src/gras/Msg/rl_msg.c
   ${XBT_RL_SRC}
-)
+  )
 
-set(XBT_SRC 
+set(XBT_SRC
   src/xbt/snprintf.c
   src/xbt/xbt_str.c
   src/xbt/xbt_strbuff.c
@@ -188,21 +187,21 @@ set(XBT_SRC
   src/xbt/xbt_socket_private.h
   src/xbt/xbt_trp_plugin_tcp.c
   src/xbt/RngStream.c
-)
+  )
 
 if(HAVE_MMAP)
   set(XBT_SRC
     ${XBT_SRC}
-    src/xbt/mmalloc/mm.c  
-  )
+    src/xbt/mmalloc/mm.c
+    )
 endif(HAVE_MMAP)
 
-set(GTNETS_SRC 
+set(GTNETS_SRC
   src/surf/gtnets/gtnets_simulator.cc
   src/surf/gtnets/gtnets_topology.cc
   src/surf/gtnets/gtnets_interface.cc
   src/surf/network_gtnets.c
-)
+  )
 
 set(NS3_SRC
   src/surf/network_ns3.c
@@ -210,9 +209,9 @@ set(NS3_SRC
   src/surf/ns3/ns3_simulator.cc
   src/surf/ns3/red-queue.cc
   src/surf/ns3/my-point-to-point-helper.cc
-)
-  
-set(SURF_SRC 
+  )
+
+set(SURF_SRC
   src/surf/surf_model.c
   src/surf/surf_action.c
   src/surf/surf_routing.c
@@ -242,9 +241,9 @@ set(SURF_SRC
   src/surf/sg_platf.c
   src/surf/storage.c
   src/xbt/xbt_sg_stubs.c
-)
+  )
 
-set(SIMIX_SRC 
+set(SIMIX_SRC
   src/simix/smx_global.c
   src/simix/smx_deployment.c
   src/simix/smx_environment.c
@@ -258,7 +257,7 @@ set(SIMIX_SRC
   src/simix/smx_smurf.c
   src/simix/smx_context_raw.c
   src/simix/smx_io.c
-)
+  )
 
 set(MSG_SRC
   src/msg/msg_config.c
@@ -273,7 +272,7 @@ set(MSG_SRC
   src/msg/msg_mailbox.c
   src/msg/msg_actions.c
   src/msg/msg_vm.c
-)
+  )
 
 set(SIMDAG_SRC
   src/simdag/sd_global.c
@@ -281,15 +280,15 @@ set(SIMDAG_SRC
   src/simdag/sd_task.c
   src/simdag/sd_workstation.c
   src/simdag/sd_daxloader.c
-)
+  )
 if(HAVE_GRAPHVIZ)
-  set(SIMDAG_SRC 
+  set(SIMDAG_SRC
     ${SIMDAG_SRC} src/simdag/sd_dotloader.c
-  )
+    )
 else(HAVE_GRAPHVIZ)
   set(EXTRA_DIST
     ${EXTRA_DIST} src/simdag/sd_dotloader.c
-  )
+    )
 endif(HAVE_GRAPHVIZ)
 
 set(GRAS_COMMON_SRC
@@ -301,13 +300,13 @@ set(GRAS_COMMON_SRC
   src/gras/Msg/gras_msg_types.c
   src/gras/Msg/gras_msg_exchange.c
   src/gras/Msg/gras_msg_listener.c
-  src/gras/Msg/rpc.c 
+  src/gras/Msg/rpc.c
   src/gras/Msg/timer.c
   src/gras/Msg/msg_interface.h
   src/gras/Msg/msg_private.h
   src/gras/Virtu/process.c
   src/gras/Virtu/gras_module.c
-)
+  )
 
 set(GRAS_SG_SRC
   src/gras/Transport/sg_transport.c
@@ -317,18 +316,18 @@ set(GRAS_SG_SRC
   src/gras/Virtu/sg_dns.c
   src/gras/Msg/sg_msg.c
   ${XBT_SG_SRC}
-)
+  )
 
 set(AMOK_SRC
   src/amok/amok_base.c
   src/amok/Bandwidth/bandwidth.c
   src/amok/Bandwidth/saturate.c
   src/amok/PeerManagement/peermanagement.c
-)
+  )
 
 set(BINDINGS_SRC
   src/bindings/bindings_global.c
-)
+  )
 
 set(LUA_SRC
   src/bindings/lua/simgrid_lua.c
@@ -340,7 +339,7 @@ set(LUA_SRC
   src/bindings/lua/lua_utils.c
   src/bindings/lua/lua_state_cloner.c
   src/bindings/lua/lua_stub_generator.c
-)
+  )
 
 set(BINDINGS_FILES
   ${LUA_SRC}
@@ -349,7 +348,7 @@ set(BINDINGS_FILES
   src/bindings/lua/lua_state_cloner.h
   src/bindings/lua/lua_private.h
   src/bindings/bindings_global.c
-)
+  )
 
 set(TRACING_SRC
   src/instr/instr_routing.c
@@ -365,8 +364,7 @@ set(TRACING_SRC
   src/instr/instr_smpi.c
   src/instr/instr_resource_utilization.c
   src/instr/instr_private.h
-)
-
+  )
 
 set(JEDULE_SRC
   include/instr/jedule/jedule_events.h
@@ -377,7 +375,7 @@ set(JEDULE_SRC
   src/instr/jedule/jedule_output.c
   src/instr/jedule/jedule_platform.c
   src/instr/jedule/jedule_sd_binding.c
-)
+  )
 
 set(MC_SRC
   src/mc/mc_memory.c
@@ -389,7 +387,7 @@ set(MC_SRC
   src/mc/mc_request.c
   src/mc/mc_private.h
   src/mc/mc_liveness.c
-)
+  )
 
 set(headers_to_install
   include/xbt/misc.h
@@ -399,7 +397,7 @@ set(headers_to_install
   include/xbt/strbuff.h
   include/xbt/hash.h
   include/xbt/function_types.h
-  include/xbt/asserts.h 
+  include/xbt/asserts.h
   include/xbt/automaton.h
   include/xbt/ex.h
   include/xbt/log.h
@@ -456,9 +454,9 @@ set(headers_to_install
   include/amok/peermanagement.h
   include/amok/bandwidth.h
   include/instr/instr.h
-  include/gras.h 
+  include/gras.h
   include/xbt.h
-)
+  )
 set(source_of_generated_headers
   include/simgrid_config.h.in
   include/smpi/smpif.h.in
@@ -484,25 +482,25 @@ if(${CONTEXT_UCONTEXT}) #ucontext
   set(SURF_SRC
     ${SURF_SRC}
     src/simix/smx_context_sysv.c
-  )
+    )
 else(${CONTEXT_UCONTEXT}) # NOT ucontext
   set(EXTRA_DIST
     ${EXTRA_DIST}
     src/simix/smx_context_sysv.c
-  )
+    )
 endif(${CONTEXT_UCONTEXT})
 
 # -->HAVE_GTNETS
 if(HAVE_GTNETS)
-  set(GTNETS_USED 
+  set(GTNETS_USED
     ${GTNETS_SRC}
-  )
+    )
 else(HAVE_GTNETS)
   set(GTNETS_USED "")
   set(EXTRA_DIST
     ${EXTRA_DIST}
     ${GTNETS_SRC}
-  )
+    )
 endif(HAVE_GTNETS)
 
 ### Simgrid Lib sources
@@ -519,7 +517,7 @@ set(simgrid_sources
   ${AMOK_SRC}
   ${BINDINGS_SRC}
   ${JEDULE_SRC}
-)
+  )
 
 if(HAVE_MC)
   set(simgrid_sources
@@ -532,7 +530,7 @@ if(HAVE_NS3)
   set(simgrid_sources
     ${simgrid_sources}
     ${NS3_SRC}
-  )
+    )
 endif(HAVE_NS3)
 
 # WINDOWS
@@ -542,7 +540,7 @@ if(WIN32)
     src/xbt/win32_ucontext.c
     src/xbt/xbt_os_thread.c
     src/simix/smx_context_thread.c
-  )
+    )
 endif(WIN32)
 
 ### Gras Lib sources
@@ -551,18 +549,18 @@ set(gras_sources
   ${GRAS_COMMON_SRC}
   ${GRAS_RL_SRC}
   ${AMOK_SRC}
-)
+  )
 
 if(${HAVE_LUA})
   set(simgrid_sources
     ${simgrid_sources}
     ${LUA_SRC}
-  )
+    )
 else(${HAVE_LUA})
   set(EXTRA_DIST
     ${EXTRA_DIST}
     ${LUA_SRC}
-  )
+    )
 endif(${HAVE_LUA})
 
 set(DOC_SOURCES
@@ -583,7 +581,7 @@ set(DOC_SOURCES
   tools/doxygen/index_create.pl
   tools/doxygen/fig2dev_postprocessor.pl
   tools/doxygen/xbt_log_extract_hierarchy.pl
-)
+  )
 
 set(USER_GUIDE_SOURCES
   doc/user_guide/doxygen/install.doc
@@ -591,13 +589,13 @@ set(USER_GUIDE_SOURCES
   doc/user_guide/doxygen/options.doc
   doc/user_guide/doxygen/use.doc
   doc/user_guide/doxygen/tracing.doc
-  doc/user_guide/doxygen/pls.doc    
-  doc/user_guide/doxygen/index.doc  
+  doc/user_guide/doxygen/pls.doc
+  doc/user_guide/doxygen/index.doc
   doc/user_guide/doxygen/modules.doc
   doc/user_guide/doxygen/platform.doc
   doc/user_guide/doxygen/UserGuideDoxyfile.in
-  doc/user_guide/doxygen/UserGuideDoxygenLayout.xml  
-)
+  doc/user_guide/doxygen/UserGuideDoxygenLayout.xml
+  )
 
 set(REF_GUIDE_SOURCES
   doc/ref_guide/doxygen/module-amok.doc
@@ -612,12 +610,12 @@ set(REF_GUIDE_SOURCES
   doc/ref_guide/doxygen/main.doc
   doc/ref_guide/doxygen/RefGuideDoxyfile.in
   doc/ref_guide/doxygen/RefGuideDoxygenLayout.xml
-)
+  )
 
 set(SHARED_SOURCES
   doc/shared/doxygen/gras-examples.doc
   doc/shared/doxygen/msg-examples.doc
-)
+  )
 
 set(DOC_FIGS
   ${CMAKE_HOME_DIRECTORY}/doc/shared/fig/simgrid_modules.fig
@@ -625,7 +623,7 @@ set(DOC_FIGS
   ${CMAKE_HOME_DIRECTORY}/doc/user_guide/fig/amok_bw_test.fig
   ${CMAKE_HOME_DIRECTORY}/doc/user_guide/fig/amok_bw_sat.fig
   ${CMAKE_HOME_DIRECTORY}/doc/user_guide/fig/gras_comm.fig
-)
+  )
 
 set(bin_files
   ${bin_files}
@@ -633,7 +631,7 @@ set(bin_files
   src/smpi/smpif2c.in
   src/smpi/smpiff.in
   src/smpi/smpirun.in
-)
+  )
 
 set(txt_files
   ${txt_files}
@@ -648,7 +646,7 @@ set(txt_files
   TODO
   configure
   INSTALL
-)
+  )
 
 set(EXAMPLES_CMAKEFILES_TXT
   examples/smpi/CMakeLists.txt
@@ -696,7 +694,7 @@ set(EXAMPLES_CMAKEFILES_TXT
   examples/lua/CMakeLists.txt
   examples/msg/CMakeLists.txt
   examples/xbt/CMakeLists.txt
-)
+  )
 
 set(TESHSUITE_CMAKEFILES_TXT
   teshsuite/xbt/CMakeLists.txt
@@ -714,19 +712,19 @@ set(TESHSUITE_CMAKEFILES_TXT
   teshsuite/gras/datadesc/CMakeLists.txt
   teshsuite/CMakeLists.txt
   teshsuite/gras/CMakeLists.txt
-)
+  )
 
 set(TOOLS_CMAKEFILES_TXT
   tools/tesh/CMakeLists.txt
   tools/graphicator/CMakeLists.txt
   tools/CMakeLists.txt
   tools/gras/CMakeLists.txt
-)
+  )
 
 set(TESTSUITE_CMAKEFILES_TXT
   testsuite/surf/CMakeLists.txt
   testsuite/xbt/CMakeLists.txt
-)
+  )
 
 set(CMAKE_SOURCE_FILES
   buildtools/Cmake/CTestConfig.cmake
@@ -790,7 +788,7 @@ set(CMAKE_SOURCE_FILES
   buildtools/Cmake/src/gras_config.h.in
   buildtools/Cmake/src/simgrid.nsi.in
   CMakeLists.txt
-)
+  )
 
 set(PLATFORMS_EXAMPLES
   examples/platforms/bypassASroute.xml
@@ -826,14 +824,14 @@ set(PLATFORMS_EXAMPLES
   examples/platforms/syscoord/median_meridian.xml
   examples/platforms/syscoord/median_p2psim.syscoord
   examples/platforms/syscoord/median_p2psim.xml
-)
+  )
 
 set(generated_src_files
   ${CMAKE_HOME_DIRECTORY}/src/xbt/datadesc/ddt_parse.yy.c
   src/xbt/automaton/parserPromela.tab.cacc
   src/xbt/automaton/parserPromela.tab.hacc
   src/xbt/automaton/automaton_lexer.yy.c
-)
+  )
 
 foreach(file ${generated_src_files})
   set_source_files_properties(${file} PROPERTIES GENERATED true)
index 472ca42..e2fb563 100644 (file)
 #########################################
 ### Fill in the "make install" target ###
 #########################################
-         
+
 # doc
 if(NOT EXISTS ${CMAKE_HOME_DIRECTORY}/doc/ref_guide/html/)
-       file(MAKE_DIRECTORY ${CMAKE_HOME_DIRECTORY}/doc/ref_guide/html/)
+  file(MAKE_DIRECTORY ${CMAKE_HOME_DIRECTORY}/doc/ref_guide/html/)
 endif(NOT EXISTS ${CMAKE_HOME_DIRECTORY}/doc/ref_guide/html/)
 
 if(NOT EXISTS ${CMAKE_HOME_DIRECTORY}/doc/user_guide/html/)
-       file(MAKE_DIRECTORY ${CMAKE_HOME_DIRECTORY}/doc/user_guide/html/)
+  file(MAKE_DIRECTORY ${CMAKE_HOME_DIRECTORY}/doc/user_guide/html/)
 endif(NOT EXISTS ${CMAKE_HOME_DIRECTORY}/doc/user_guide/html/)
 
-
 install(DIRECTORY "${CMAKE_HOME_DIRECTORY}/doc/ref_guide/html/"
   DESTINATION "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/doc/simgrid/ref_guide/html/"
-  PATTERN ".svn" EXCLUDE 
-  PATTERN ".git" EXCLUDE 
+  PATTERN ".svn" EXCLUDE
+  PATTERN ".git" EXCLUDE
   PATTERN "*.o" EXCLUDE
   PATTERN "*~" EXCLUDE
-)
-
+  )
 
 install(DIRECTORY "${CMAKE_HOME_DIRECTORY}/doc/user_guide/html/"
   DESTINATION "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/doc/simgrid/user_guide/html/"
-  PATTERN ".svn" EXCLUDE 
-  PATTERN ".git" EXCLUDE 
+  PATTERN ".svn" EXCLUDE
+  PATTERN ".git" EXCLUDE
   PATTERN "*.o" EXCLUDE
   PATTERN "*~" EXCLUDE
-)
+  )
 
 #### Generate the manpages
 if(NOT WIN32)
-if( NOT MANPAGE_DIR)
-       set( MANPAGE_DIR ${CMAKE_BINARY_DIR}/manpages )
-endif( NOT MANPAGE_DIR)
-
-add_custom_target(manpages ALL
-        COMMAND ${CMAKE_COMMAND} -E make_directory ${MANPAGE_DIR}
-       COMMAND pod2man ${CMAKE_HOME_DIRECTORY}/tools/simgrid_update_xml.pl > ${MANPAGE_DIR}/simgrid_update_xml.1
-       COMMENT "Generating manpages"
-)
-install(FILES ${MANPAGE_DIR}/simgrid_update_xml.1
-        DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/share/man/man1)
+  if( NOT MANPAGE_DIR)
+    set( MANPAGE_DIR ${CMAKE_BINARY_DIR}/manpages )
+  endif( NOT MANPAGE_DIR)
+
+  add_custom_target(manpages ALL
+    COMMAND ${CMAKE_COMMAND} -E make_directory ${MANPAGE_DIR}
+    COMMAND pod2man ${CMAKE_HOME_DIRECTORY}/tools/simgrid_update_xml.pl > ${MANPAGE_DIR}/simgrid_update_xml.1
+    COMMENT "Generating manpages"
+    )
+  install(FILES ${MANPAGE_DIR}/simgrid_update_xml.1
+    DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/share/man/man1)
 
 endif(NOT WIN32)
 
 # binaries
 install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/smpicc
-                 ${CMAKE_BINARY_DIR}/bin/smpif2c
-                 ${CMAKE_BINARY_DIR}/bin/smpiff
-                 ${CMAKE_BINARY_DIR}/bin/smpirun
-               DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/)
+  ${CMAKE_BINARY_DIR}/bin/smpif2c
+  ${CMAKE_BINARY_DIR}/bin/smpiff
+  ${CMAKE_BINARY_DIR}/bin/smpirun
+  DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/)
 
 install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/tesh
-DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/)
+  DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/)
 
 install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/graphicator
-DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/)
-       
+  DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/)
+
 install(PROGRAMS ${CMAKE_HOME_DIRECTORY}/tools/MSG_visualization/colorize.pl
-        DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/
-               RENAME simgrid-colorizer)
-               
+  DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/
+  RENAME simgrid-colorizer)
+
 add_custom_target(simgrid-colorizer ALL
-COMMENT "Install ${CMAKE_BINARY_DIR}/bin/colorize"
-COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/tools/MSG_visualization/colorize.pl ${CMAKE_BINARY_DIR}/bin/colorize
-)
-                               
+  COMMENT "Install ${CMAKE_BINARY_DIR}/bin/colorize"
+  COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/tools/MSG_visualization/colorize.pl ${CMAKE_BINARY_DIR}/bin/colorize
+  )
+
 install(PROGRAMS ${CMAKE_HOME_DIRECTORY}/tools/simgrid_update_xml.pl
-               DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/
-               RENAME simgrid_update_xml)
-               
+  DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/
+  RENAME simgrid_update_xml)
+
 add_custom_target(simgrid_update_xml ALL
-COMMENT "Install ${CMAKE_BINARY_DIR}/bin/simgrid_update_xml"
-COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/tools/simgrid_update_xml.pl ${CMAKE_BINARY_DIR}/bin/simgrid_update_xml
-)
-               
+  COMMENT "Install ${CMAKE_BINARY_DIR}/bin/simgrid_update_xml"
+  COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/tools/simgrid_update_xml.pl ${CMAKE_BINARY_DIR}/bin/simgrid_update_xml
+  )
+
 install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/gras_stub_generator
-               DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/)
+  DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/)
 
 # libraries
-install(TARGETS simgrid gras 
-        DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/)
-       
-if(enable_smpi)        
+install(TARGETS simgrid gras
+  DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/)
+
+if(enable_smpi)
   install(TARGETS smpi
-          DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/)
+    DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/)
 endif(enable_smpi)
 
 if(enable_lib_static AND NOT WIN32)
-       install(TARGETS simgrid_static 
-               DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/)
-       if(enable_smpi) 
-               install(TARGETS smpi_static
-                       DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/)
-       endif(enable_smpi)
+  install(TARGETS simgrid_static
+    DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/)
+  if(enable_smpi)
+    install(TARGETS smpi_static
+      DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/)
+  endif(enable_smpi)
 endif(enable_lib_static AND NOT WIN32)
 
 # include files
 set(HEADERS
-    ${headers_to_install}
-    ${generated_headers_to_install}
-    )
+  ${headers_to_install}
+  ${generated_headers_to_install}
+  )
 foreach(file ${HEADERS})
   get_filename_component(location ${file} PATH)
   string(REPLACE "${CMAKE_CURRENT_BINARY_DIR}/" "" location "${location}")
   install(FILES ${file}
-          DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${location})
+    DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${location})
 endforeach(file ${HEADERS})
 
 # example files
@@ -114,24 +112,24 @@ foreach(file ${examples_to_install})
   string(REPLACE "${CMAKE_CURRENT_SOURCE_DIR}/examples/" "" file ${file})
   get_filename_component(location ${file} PATH)
   install(FILES "examples/${file}"
-          DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/doc/simgrid/examples/${location})
+    DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/doc/simgrid/examples/${location})
 endforeach(file ${examples_to_install})
 
 # bindings cruft
 
 if(HAVE_LUA)
-       file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/lib/lua/5.1")
-       add_custom_target(simgrid_lua ALL
-               DEPENDS simgrid 
-                               ${CMAKE_BINARY_DIR}/lib/lua/5.1/simgrid.${LIB_EXE}
-               )
-       add_custom_command(
-               OUTPUT ${CMAKE_BINARY_DIR}/lib/lua/5.1/simgrid.${LIB_EXE}
-               COMMAND ${CMAKE_COMMAND} -E create_symlink ../../libsimgrid.${LIB_EXE} ${CMAKE_BINARY_DIR}/lib/lua/5.1/simgrid.${LIB_EXE}
-       )
-       install(FILES ${CMAKE_BINARY_DIR}/lib/lua/5.1/simgrid.${LIB_EXE}
-               DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/lua/5.1
-               )
+  file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/lib/lua/5.1")
+  add_custom_target(simgrid_lua ALL
+    DEPENDS simgrid
+    ${CMAKE_BINARY_DIR}/lib/lua/5.1/simgrid.${LIB_EXE}
+    )
+  add_custom_command(
+    OUTPUT ${CMAKE_BINARY_DIR}/lib/lua/5.1/simgrid.${LIB_EXE}
+    COMMAND ${CMAKE_COMMAND} -E create_symlink ../../libsimgrid.${LIB_EXE} ${CMAKE_BINARY_DIR}/lib/lua/5.1/simgrid.${LIB_EXE}
+    )
+  install(FILES ${CMAKE_BINARY_DIR}/lib/lua/5.1/simgrid.${LIB_EXE}
+    DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/lua/5.1
+    )
 endif(HAVE_LUA)
 
 ###########################################
@@ -139,48 +137,48 @@ endif(HAVE_LUA)
 ###########################################
 
 add_custom_target(uninstall
-COMMAND ${CMAKE_COMMAND} -E    remove_directory ${CMAKE_INSTALL_PREFIX}/doc/simgrid
-COMMAND ${CMAKE_COMMAND} -E    echo "uninstall doc ok"
-COMMAND ${CMAKE_COMMAND} -E    remove -f ${CMAKE_INSTALL_PREFIX}/lib/libgras*
-COMMAND ${CMAKE_COMMAND} -E    remove -f ${CMAKE_INSTALL_PREFIX}/lib/libsimgrid*
-COMMAND ${CMAKE_COMMAND} -E    remove -f ${CMAKE_INSTALL_PREFIX}/lib/libsmpi*
-COMMAND ${CMAKE_COMMAND} -E    echo "uninstall lib ok"
-COMMAND ${CMAKE_COMMAND} -E    remove -f ${CMAKE_INSTALL_PREFIX}/bin/smpicc
-COMMAND ${CMAKE_COMMAND} -E    remove -f ${CMAKE_INSTALL_PREFIX}/bin/smpif2c
-COMMAND ${CMAKE_COMMAND} -E    remove -f ${CMAKE_INSTALL_PREFIX}/bin/smpiff
-COMMAND ${CMAKE_COMMAND} -E    remove -f ${CMAKE_INSTALL_PREFIX}/bin/smpirun
-COMMAND ${CMAKE_COMMAND} -E    remove -f ${CMAKE_INSTALL_PREFIX}/bin/tesh
-COMMAND ${CMAKE_COMMAND} -E    remove -f ${CMAKE_INSTALL_PREFIX}/bin/simgrid-colorizer
-COMMAND ${CMAKE_COMMAND} -E    remove -f ${CMAKE_INSTALL_PREFIX}/bin/simgrid_update_xml
-COMMAND ${CMAKE_COMMAND} -E    remove -f ${CMAKE_INSTALL_PREFIX}/bin/gras_stub_generator
-COMMAND ${CMAKE_COMMAND} -E    remove -f ${CMAKE_INSTALL_PREFIX}/bin/graphicator
-COMMAND ${CMAKE_COMMAND} -E    echo "uninstall bin ok"
-COMMAND ${CMAKE_COMMAND} -E    remove_directory ${CMAKE_INSTALL_PREFIX}/include/amok
-COMMAND ${CMAKE_COMMAND} -E    remove_directory ${CMAKE_INSTALL_PREFIX}/include/gras
-COMMAND ${CMAKE_COMMAND} -E    remove_directory ${CMAKE_INSTALL_PREFIX}/include/instr
-COMMAND ${CMAKE_COMMAND} -E    remove_directory ${CMAKE_INSTALL_PREFIX}/include/msg 
-COMMAND ${CMAKE_COMMAND} -E    remove_directory ${CMAKE_INSTALL_PREFIX}/include/simdag
-COMMAND ${CMAKE_COMMAND} -E    remove_directory ${CMAKE_INSTALL_PREFIX}/include/smpi
-COMMAND ${CMAKE_COMMAND} -E    remove_directory ${CMAKE_INSTALL_PREFIX}/include/simix
-COMMAND ${CMAKE_COMMAND} -E    remove_directory ${CMAKE_INSTALL_PREFIX}/include/surf
-COMMAND ${CMAKE_COMMAND} -E    remove_directory ${CMAKE_INSTALL_PREFIX}/include/xbt
-COMMAND ${CMAKE_COMMAND} -E    remove_directory ${CMAKE_INSTALL_PREFIX}/include/mc
-COMMAND ${CMAKE_COMMAND} -E    remove_directory ${CMAKE_INSTALL_PREFIX}/include/simgrid
-COMMAND ${CMAKE_COMMAND} -E    remove -f ${CMAKE_INSTALL_PREFIX}/include/simgrid_config.h
-COMMAND ${CMAKE_COMMAND} -E    remove -f ${CMAKE_INSTALL_PREFIX}/include/gras.h 
-COMMAND ${CMAKE_COMMAND} -E    remove -f ${CMAKE_INSTALL_PREFIX}/include/xbt.h
-COMMAND ${CMAKE_COMMAND} -E    echo "uninstall include ok"
-COMMAND ${CMAKE_COMMAND} -E    remove -f ${CMAKE_INSTALL_PREFIX}/share/man/man1/simgrid_update_xml.1
-COMMAND ${CMAKE_COMMAND} -E    echo "uninstall man ok"
-WORKING_DIRECTORY "${CMAKE_INSTALL_PREFIX}"
-)
+  COMMAND ${CMAKE_COMMAND} -E  remove_directory ${CMAKE_INSTALL_PREFIX}/doc/simgrid
+  COMMAND ${CMAKE_COMMAND} -E  echo "uninstall doc ok"
+  COMMAND ${CMAKE_COMMAND} -E  remove -f ${CMAKE_INSTALL_PREFIX}/lib/libgras*
+  COMMAND ${CMAKE_COMMAND} -E  remove -f ${CMAKE_INSTALL_PREFIX}/lib/libsimgrid*
+  COMMAND ${CMAKE_COMMAND} -E  remove -f ${CMAKE_INSTALL_PREFIX}/lib/libsmpi*
+  COMMAND ${CMAKE_COMMAND} -E  echo "uninstall lib ok"
+  COMMAND ${CMAKE_COMMAND} -E  remove -f ${CMAKE_INSTALL_PREFIX}/bin/smpicc
+  COMMAND ${CMAKE_COMMAND} -E  remove -f ${CMAKE_INSTALL_PREFIX}/bin/smpif2c
+  COMMAND ${CMAKE_COMMAND} -E  remove -f ${CMAKE_INSTALL_PREFIX}/bin/smpiff
+  COMMAND ${CMAKE_COMMAND} -E  remove -f ${CMAKE_INSTALL_PREFIX}/bin/smpirun
+  COMMAND ${CMAKE_COMMAND} -E  remove -f ${CMAKE_INSTALL_PREFIX}/bin/tesh
+  COMMAND ${CMAKE_COMMAND} -E  remove -f ${CMAKE_INSTALL_PREFIX}/bin/simgrid-colorizer
+  COMMAND ${CMAKE_COMMAND} -E  remove -f ${CMAKE_INSTALL_PREFIX}/bin/simgrid_update_xml
+  COMMAND ${CMAKE_COMMAND} -E  remove -f ${CMAKE_INSTALL_PREFIX}/bin/gras_stub_generator
+  COMMAND ${CMAKE_COMMAND} -E  remove -f ${CMAKE_INSTALL_PREFIX}/bin/graphicator
+  COMMAND ${CMAKE_COMMAND} -E  echo "uninstall bin ok"
+  COMMAND ${CMAKE_COMMAND} -E  remove_directory ${CMAKE_INSTALL_PREFIX}/include/amok
+  COMMAND ${CMAKE_COMMAND} -E  remove_directory ${CMAKE_INSTALL_PREFIX}/include/gras
+  COMMAND ${CMAKE_COMMAND} -E  remove_directory ${CMAKE_INSTALL_PREFIX}/include/instr
+  COMMAND ${CMAKE_COMMAND} -E  remove_directory ${CMAKE_INSTALL_PREFIX}/include/msg
+  COMMAND ${CMAKE_COMMAND} -E  remove_directory ${CMAKE_INSTALL_PREFIX}/include/simdag
+  COMMAND ${CMAKE_COMMAND} -E  remove_directory ${CMAKE_INSTALL_PREFIX}/include/smpi
+  COMMAND ${CMAKE_COMMAND} -E  remove_directory ${CMAKE_INSTALL_PREFIX}/include/simix
+  COMMAND ${CMAKE_COMMAND} -E  remove_directory ${CMAKE_INSTALL_PREFIX}/include/surf
+  COMMAND ${CMAKE_COMMAND} -E  remove_directory ${CMAKE_INSTALL_PREFIX}/include/xbt
+  COMMAND ${CMAKE_COMMAND} -E  remove_directory ${CMAKE_INSTALL_PREFIX}/include/mc
+  COMMAND ${CMAKE_COMMAND} -E  remove_directory ${CMAKE_INSTALL_PREFIX}/include/simgrid
+  COMMAND ${CMAKE_COMMAND} -E  remove -f ${CMAKE_INSTALL_PREFIX}/include/simgrid_config.h
+  COMMAND ${CMAKE_COMMAND} -E  remove -f ${CMAKE_INSTALL_PREFIX}/include/gras.h
+  COMMAND ${CMAKE_COMMAND} -E  remove -f ${CMAKE_INSTALL_PREFIX}/include/xbt.h
+  COMMAND ${CMAKE_COMMAND} -E  echo "uninstall include ok"
+  COMMAND ${CMAKE_COMMAND} -E  remove -f ${CMAKE_INSTALL_PREFIX}/share/man/man1/simgrid_update_xml.1
+  COMMAND ${CMAKE_COMMAND} -E  echo "uninstall man ok"
+  WORKING_DIRECTORY "${CMAKE_INSTALL_PREFIX}"
+  )
 
 if(HAVE_LUA)
-       add_custom_command(TARGET uninstall
-       COMMAND ${CMAKE_COMMAND} -E echo "uninstall binding lua ok"
-       COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_INSTALL_PREFIX}/lib/lua/5.1/simgrid.${LIB_EXE}
-       WORKING_DIRECTORY "${CMAKE_HOME_DIRECTORY}/"
-       )
+  add_custom_command(TARGET uninstall
+    COMMAND ${CMAKE_COMMAND} -E echo "uninstall binding lua ok"
+    COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_INSTALL_PREFIX}/lib/lua/5.1/simgrid.${LIB_EXE}
+    WORKING_DIRECTORY "${CMAKE_HOME_DIRECTORY}/"
+    )
 endif(HAVE_LUA)
 
 ################################################################
@@ -190,7 +188,7 @@ endif(HAVE_LUA)
 ################################################################
 
 # This is the complete list of what will be added to the source archive
-set(source_to_pack  
+set(source_to_pack
   ${headers_to_install}
   ${source_of_generated_headers}
   ${XBT_RL_SRC}
@@ -232,7 +230,7 @@ set(source_to_pack
   ${tools_src}
   ${testsuite_src}
   ${PLATFORMS_EXAMPLES}
-)
+  )
 
 ##########################################
 ### Fill in the "make dist-dir" target ###
@@ -247,7 +245,7 @@ add_custom_target(dist-dir
   COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_NAME}-${release_version}/doc/ref_guide/html/
   COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_HOME_DIRECTORY}/doc/user_guide/html/ ${PROJECT_NAME}-${release_version}/doc/user_guide/html/
   COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_HOME_DIRECTORY}/doc/ref_guide/html/ ${PROJECT_NAME}-${release_version}/doc/ref_guide/html/
-)
+  )
 add_dependencies(dist-dir simgrid_documentation)
 add_dependencies(dist-dir maintainer_files)
 
@@ -256,7 +254,7 @@ foreach(file ${source_to_pack})
   #message(${file})
   # This damn prefix is still set somewhere (seems to be in subdirs)
   string(REPLACE "${CMAKE_HOME_DIRECTORY}/" "" file "${file}")
-  
+
   # Create the directory on need
   get_filename_component(file_location ${file} PATH)
   string(REGEX MATCH ";${file_location};" OPERATION "${dirs_in_tarball}")
@@ -265,19 +263,19 @@ foreach(file ${source_to_pack})
     add_custom_command(
       TARGET dist-dir
       COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_NAME}-${release_version}/${file_location}/
-    )
+      )
   endif(NOT OPERATION)
-  
+
   # Actually copy the file
   add_custom_command(
     TARGET dist-dir
     COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/${file} ${PROJECT_NAME}-${release_version}/${file_location}/
-  )
-  
+    )
+
   add_custom_command(
     TARGET dist-dir
     COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Scripts/Makefile.default ${PROJECT_NAME}-${release_version}/Makefile
-  )
+    )
 endforeach(file ${source_to_pack})
 
 ######################################
@@ -288,15 +286,15 @@ add_custom_target(dist
   COMMENT "Removing the distribution directory"
   DEPENDS ${CMAKE_BINARY_DIR}/${PROJECT_NAME}-${release_version}.tar.gz
   COMMAND ${CMAKE_COMMAND} -E remove_directory ${PROJECT_NAME}-${release_version}/
-)
+  )
 
 add_custom_command(
-       OUTPUT ${CMAKE_BINARY_DIR}/${PROJECT_NAME}-${release_version}.tar.gz    
-       COMMENT "Compressing the archive from the distribution directory"
-       COMMAND ${CMAKE_COMMAND} -E tar cf ${PROJECT_NAME}-${release_version}.tar ${PROJECT_NAME}-${release_version}/
-       COMMAND gzip -9v ${PROJECT_NAME}-${release_version}.tar
-       COMMAND ${CMAKE_COMMAND} -E remove_directory ${PROJECT_NAME}-${release_version}/
-)
+  OUTPUT ${CMAKE_BINARY_DIR}/${PROJECT_NAME}-${release_version}.tar.gz
+  COMMENT "Compressing the archive from the distribution directory"
+  COMMAND ${CMAKE_COMMAND} -E tar cf ${PROJECT_NAME}-${release_version}.tar ${PROJECT_NAME}-${release_version}/
+  COMMAND gzip -9v ${PROJECT_NAME}-${release_version}.tar
+  COMMAND ${CMAKE_COMMAND} -E remove_directory ${PROJECT_NAME}-${release_version}/
+  )
 add_dependencies(dist dist-dir)
 
 if(NOT enable_maintainer_mode)
@@ -304,8 +302,8 @@ if(NOT enable_maintainer_mode)
     COMMAND ${CMAKE_COMMAND} -E echo "WARNING: ----------------------------------------------------"
     COMMAND ${CMAKE_COMMAND} -E echo "WARNING: Distrib is generated without option maintainer mode "
     COMMAND ${CMAKE_COMMAND} -E echo "WARNING: ----------------------------------------------------"
-  )
-   add_dependencies(dist echo-dist)
+    )
+  add_dependencies(dist echo-dist)
 endif(NOT enable_maintainer_mode)
 
 ###########################################
@@ -317,7 +315,7 @@ set(CMAKE_BINARY_TEST_DIR ${CMAKE_BINARY_DIR})
 # Allow to test the "make dist"
 add_custom_target(distcheck
   COMMAND ${CMAKE_COMMAND} -E echo "XXX remove old copy"
-  COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_BINARY_TEST_DIR}/${PROJECT_NAME}-${release_version} 
+  COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_BINARY_TEST_DIR}/${PROJECT_NAME}-${release_version}
 
   COMMAND ${CMAKE_COMMAND} -E echo "XXX Untar distrib"
   COMMAND ${CMAKE_COMMAND} -E tar  xf ${CMAKE_BINARY_TEST_DIR}/${PROJECT_NAME}-${release_version}.tar.gz ${CMAKE_BINARY_TEST_DIR}/${PROJECT_NAME}-${release_version}
@@ -325,14 +323,14 @@ add_custom_target(distcheck
   COMMAND ${CMAKE_COMMAND} -E echo "XXX create build and install subtrees"
   COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_TEST_DIR}/${PROJECT_NAME}-${release_version}/_build
   COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_TEST_DIR}/${PROJECT_NAME}-${release_version}/_inst
-   
+
   COMMAND ${CMAKE_COMMAND} -E echo "XXX Configure"
-  COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_TEST_DIR}/${PROJECT_NAME}-${release_version}/_build 
-          ${CMAKE_COMMAND} 
-          -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_TEST_DIR}/${PROJECT_NAME}-${release_version}/_inst 
-          -Denable_lua=ON
-          -Denable_model-checking=ON
-          ..
+  COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_TEST_DIR}/${PROJECT_NAME}-${release_version}/_build
+  ${CMAKE_COMMAND}
+  -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_TEST_DIR}/${PROJECT_NAME}-${release_version}/_inst
+  -Denable_lua=ON
+  -Denable_model-checking=ON
+  ..
   COMMAND ${CMAKE_COMMAND} -E echo "XXX Build"
   COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_TEST_DIR}/${PROJECT_NAME}-${release_version}/_build ${CMAKE_MAKE_PROGRAM}
 
@@ -341,13 +339,13 @@ add_custom_target(distcheck
 
   COMMAND ${CMAKE_COMMAND} -E echo "XXX Install"
   COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_TEST_DIR}/${PROJECT_NAME}-${release_version}/_build ${CMAKE_MAKE_PROGRAM} install
-  COMMAND ${CMAKE_COMMAND} -E create_symlink 
-                            ${CMAKE_BINARY_TEST_DIR}/${PROJECT_NAME}-${release_version}/_inst/lib/libsimgrid.so
-                            ${CMAKE_BINARY_TEST_DIR}/${PROJECT_NAME}-${release_version}/_inst/lib/libsimgridtest.so
+  COMMAND ${CMAKE_COMMAND} -E create_symlink
+  ${CMAKE_BINARY_TEST_DIR}/${PROJECT_NAME}-${release_version}/_inst/lib/libsimgrid.so
+  ${CMAKE_BINARY_TEST_DIR}/${PROJECT_NAME}-${release_version}/_inst/lib/libsimgridtest.so
 
   COMMAND ${CMAKE_COMMAND} -E echo "XXX Remove temp directories"
   COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_BINARY_TEST_DIR}/${PROJECT_NAME}-${release_version}
-)
+  )
 #add_dependencies(distcheck dist)
 
 #######################################
@@ -355,13 +353,13 @@ add_custom_target(distcheck
 #######################################
 
 if(enable_memcheck)
-       add_custom_target(check
-       COMMAND ctest -D ExperimentalMemCheck
-       )
+  add_custom_target(check
+    COMMAND ctest -D ExperimentalMemCheck
+    )
 else(enable_memcheck)
-       add_custom_target(check
-       COMMAND make test
-       )
+  add_custom_target(check
+    COMMAND make test
+    )
 endif(enable_memcheck)
 
 #######################################
@@ -369,27 +367,27 @@ endif(enable_memcheck)
 #######################################
 
 add_custom_target(maintainer-clean
-COMMAND ${CMAKE_COMMAND} -E remove -f src/config_unit.c
-COMMAND ${CMAKE_COMMAND} -E remove -f src/cunit_unit.c
-COMMAND ${CMAKE_COMMAND} -E remove -f src/dict_unit.c
-COMMAND ${CMAKE_COMMAND} -E remove -f src/dynar_unit.c
-COMMAND ${CMAKE_COMMAND} -E remove -f src/ex_unit.c
-COMMAND ${CMAKE_COMMAND} -E remove -f src/set_unit.c
-COMMAND ${CMAKE_COMMAND} -E remove -f src/simgrid_units_main.c
-COMMAND ${CMAKE_COMMAND} -E remove -f src/swag_unit.c
-COMMAND ${CMAKE_COMMAND} -E remove -f src/xbt_sha_unit.c
-COMMAND ${CMAKE_COMMAND} -E remove -f src/xbt_str_unit.c
-COMMAND ${CMAKE_COMMAND} -E remove -f src/xbt_strbuff_unit.c
-COMMAND ${CMAKE_COMMAND} -E remove -f src/xbt_synchro_unit.c
-WORKING_DIRECTORY "${CMAKE_HOME_DIRECTORY}"
-)
+  COMMAND ${CMAKE_COMMAND} -E remove -f src/config_unit.c
+  COMMAND ${CMAKE_COMMAND} -E remove -f src/cunit_unit.c
+  COMMAND ${CMAKE_COMMAND} -E remove -f src/dict_unit.c
+  COMMAND ${CMAKE_COMMAND} -E remove -f src/dynar_unit.c
+  COMMAND ${CMAKE_COMMAND} -E remove -f src/ex_unit.c
+  COMMAND ${CMAKE_COMMAND} -E remove -f src/set_unit.c
+  COMMAND ${CMAKE_COMMAND} -E remove -f src/simgrid_units_main.c
+  COMMAND ${CMAKE_COMMAND} -E remove -f src/swag_unit.c
+  COMMAND ${CMAKE_COMMAND} -E remove -f src/xbt_sha_unit.c
+  COMMAND ${CMAKE_COMMAND} -E remove -f src/xbt_str_unit.c
+  COMMAND ${CMAKE_COMMAND} -E remove -f src/xbt_strbuff_unit.c
+  COMMAND ${CMAKE_COMMAND} -E remove -f src/xbt_synchro_unit.c
+  WORKING_DIRECTORY "${CMAKE_HOME_DIRECTORY}"
+  )
 
 add_custom_target(supernovae-clean
-COMMAND ${CMAKE_COMMAND} -E remove -f src/supernovae_gras.c
-COMMAND ${CMAKE_COMMAND} -E remove -f src/supernovae_sg.c
-COMMAND ${CMAKE_COMMAND} -E remove -f src/supernovae_smpi.c
-WORKING_DIRECTORY "${CMAKE_HOME_DIRECTORY}"
-)
+  COMMAND ${CMAKE_COMMAND} -E remove -f src/supernovae_gras.c
+  COMMAND ${CMAKE_COMMAND} -E remove -f src/supernovae_sg.c
+  COMMAND ${CMAKE_COMMAND} -E remove -f src/supernovae_smpi.c
+  WORKING_DIRECTORY "${CMAKE_HOME_DIRECTORY}"
+  )
 
 #############################################
 ### Fill in the "make sync-gforge" target ###
@@ -397,11 +395,11 @@ WORKING_DIRECTORY "${CMAKE_HOME_DIRECTORY}"
 
 #PIPOL
 add_custom_target(sync-pipol
-COMMAND scp -r Experimental_bindings.sh Experimental.sh  MemCheck.sh pre-simgrid.sh navarro@pipol.inria.fr:~/
-COMMAND scp -r rc.* navarro@pipol.inria.fr:~/.pipol/
-COMMAND scp -r Nightly* navarro@pipol.inria.fr:~/.pipol/nightly
-COMMAND ssh navarro@pipol.inria.fr "chmod a=rwx ~/* ~/.pipol/rc.* ~/.pipol/nightly/*"
-WORKING_DIRECTORY "${CMAKE_HOME_DIRECTORY}/buildtools/pipol/"
-)
+  COMMAND scp -r Experimental_bindings.sh Experimental.sh  MemCheck.sh pre-simgrid.sh navarro@pipol.inria.fr:~/
+  COMMAND scp -r rc.* navarro@pipol.inria.fr:~/.pipol/
+  COMMAND scp -r Nightly* navarro@pipol.inria.fr:~/.pipol/nightly
+  COMMAND ssh navarro@pipol.inria.fr "chmod a=rwx ~/* ~/.pipol/rc.* ~/.pipol/nightly/*"
+  WORKING_DIRECTORY "${CMAKE_HOME_DIRECTORY}/buildtools/pipol/"
+  )
 
 include(CPack)
index e6d51d3..c2f7462 100644 (file)
@@ -2,42 +2,42 @@ set(warnCFLAGS "")
 set(optCFLAGS "")
 
 if(NOT __VISUALC__ AND NOT __BORLANDC__)
-       set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-g3")
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-g3")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}-g3")
 else(NOT __VISUALC__ AND NOT __BORLANDC__)
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}/Zi")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}/Zi")
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}/Zi")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}/Zi")
 endif(NOT __VISUALC__ AND NOT __BORLANDC__)
 
 if(enable_compile_warnings)
-     set(warnCFLAGS "-Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wpointer-arith -Wchar-subscripts -Wcomment -Wformat -Wwrite-strings -Wclobbered -Wno-unused-function -Wno-unused-parameter -Wno-strict-aliasing -Wno-format-nonliteral -Werror ")
-    if(COMPILER_C_VERSION_MAJOR_MINOR STRGREATER "4.5")
-        set(warnCFLAGS "${warnCFLAGS} -Wno-error=unused-but-set-variable ")
-    else(COMPILER_C_VERSION_MAJOR_MINOR STRGREATER "4.5")
-        set(warnCFLAGS "${warnCFLAGS} -Wno-error=clobbered ")
-    endif(COMPILER_C_VERSION_MAJOR_MINOR STRGREATER "4.5")
+  set(warnCFLAGS "-Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wpointer-arith -Wchar-subscripts -Wcomment -Wformat -Wwrite-strings -Wclobbered -Wno-unused-function -Wno-unused-parameter -Wno-strict-aliasing -Wno-format-nonliteral -Werror ")
+  if(COMPILER_C_VERSION_MAJOR_MINOR STRGREATER "4.5")
+    set(warnCFLAGS "${warnCFLAGS} -Wno-error=unused-but-set-variable ")
+  else(COMPILER_C_VERSION_MAJOR_MINOR STRGREATER "4.5")
+    set(warnCFLAGS "${warnCFLAGS} -Wno-error=clobbered ")
+  endif(COMPILER_C_VERSION_MAJOR_MINOR STRGREATER "4.5")
 endif(enable_compile_warnings)
 
 if(enable_compile_optimizations)
-       set(optCFLAGS "-O3 -finline-functions -funroll-loops -fno-strict-aliasing ")
-       if(COMPILER_C_VERSION_MAJOR_MINOR STRGREATER "4.5")
-           set(optCFLAGS "${optCFLAGS}-flto ")
-       endif(COMPILER_C_VERSION_MAJOR_MINOR STRGREATER "4.5")
+  set(optCFLAGS "-O3 -finline-functions -funroll-loops -fno-strict-aliasing ")
+  if(COMPILER_C_VERSION_MAJOR_MINOR STRGREATER "4.5")
+    set(optCFLAGS "${optCFLAGS}-flto ")
+  endif(COMPILER_C_VERSION_MAJOR_MINOR STRGREATER "4.5")
 else(enable_compile_optimizations)
-        set(optCFLAGS "-O0 ")
+  set(optCFLAGS "-O0 ")
 endif(enable_compile_optimizations)
 
 if(APPLE AND COMPILER_C_VERSION_MAJOR_MINOR MATCHES "4.6")
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-deprecated-declarations")     
-    set(optCFLAGS "-O0 ")
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-deprecated-declarations")
+  set(optCFLAGS "-O0 ")
 endif(APPLE AND COMPILER_C_VERSION_MAJOR_MINOR MATCHES "4.6")
 
 if(NOT enable_debug)
-    set(CMAKE_C_FLAGS "-DNDEBUG ${CMAKE_C_FLAGS}")
+  set(CMAKE_C_FLAGS "-DNDEBUG ${CMAKE_C_FLAGS}")
 endif(NOT enable_debug)
 
 if(enable_msg_deprecated)
-    set(CMAKE_C_FLAGS "-DMSG_USE_DEPRECATED ${CMAKE_C_FLAGS}")
+  set(CMAKE_C_FLAGS "-DMSG_USE_DEPRECATED ${CMAKE_C_FLAGS}")
 endif(enable_msg_deprecated)
 
 set(CMAKE_C_FLAGS "${optCFLAGS}${warnCFLAGS}${CMAKE_C_FLAGS}")
@@ -46,31 +46,31 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${optCFLAGS}")
 
 # Try to make Mac a bit more complient to open source standards
 if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
-       set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_XOPEN_SOURCE")
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_XOPEN_SOURCE")
 endif(CMAKE_SYSTEM_NAME MATCHES "Darwin")
 
 set(TESH_OPTION "")
 if(enable_coverage)
-       find_program(GCOV_PATH gcov)
-       if(GCOV_PATH)
-               SET(COVERAGE_COMMAND "${GCOV_PATH}" CACHE TYPE FILEPATH FORCE)
-               set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fprofile-arcs -ftest-coverage")
-               set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage")
-               set(TESH_OPTION --enable-coverage)
-               add_definitions(-fprofile-arcs -ftest-coverage)
-       endif(GCOV_PATH)
+  find_program(GCOV_PATH gcov)
+  if(GCOV_PATH)
+    SET(COVERAGE_COMMAND "${GCOV_PATH}" CACHE TYPE FILEPATH FORCE)
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fprofile-arcs -ftest-coverage")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage")
+    set(TESH_OPTION --enable-coverage)
+    add_definitions(-fprofile-arcs -ftest-coverage)
+  endif(GCOV_PATH)
 endif(enable_coverage)
 
 if(NOT $ENV{CFLAGS} STREQUAL "")
-    message(STATUS "Add CFLAGS: \"$ENV{CFLAGS}\" to CMAKE_C_FLAGS")
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} $ENV{CFLAGS}")
+  message(STATUS "Add CFLAGS: \"$ENV{CFLAGS}\" to CMAKE_C_FLAGS")
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} $ENV{CFLAGS}")
 endif(NOT $ENV{CFLAGS} STREQUAL "")
 
 if(NOT $ENV{LDFLAGS} STREQUAL "")
-    message(STATUS "Add LDFLAGS: \"$ENV{LDFLAGS}\" to CMAKE_C_LINK_FLAGS")
-    set(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} $ENV{LDFLAGS}")
+  message(STATUS "Add LDFLAGS: \"$ENV{LDFLAGS}\" to CMAKE_C_LINK_FLAGS")
+  set(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} $ENV{LDFLAGS}")
 endif(NOT $ENV{LDFLAGS} STREQUAL "")
 
 if(enable_model-checking AND enable_compile_optimizations)
-    message(WARNING "Sorry for now GCC optimizations does not work with model checking.\nPlease turn off optimizations with command:\ncmake -Denable_compile_optimizations=off. ")
+  message(WARNING "Sorry for now GCC optimizations does not work with model checking.\nPlease turn off optimizations with command:\ncmake -Denable_compile_optimizations=off. ")
 endif(enable_model-checking AND enable_compile_optimizations)
index 6856a07..d24b987 100644 (file)
@@ -16,38 +16,38 @@ if(DOXYGEN_PATH)
   include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/GenerateUserGuide.cmake)
   include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/GenerateRefGuide.cmake)
 
-  set(DOC_PNGS 
+  set(DOC_PNGS
     ${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_logo_2011.png
     ${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_logo_2011_small.png
-  )
-  
+    )
+
   configure_file(${CMAKE_HOME_DIRECTORY}/doc/Doxyfile.in ${CMAKE_HOME_DIRECTORY}/doc/Doxyfile @ONLY)
-  
+
   ADD_CUSTOM_TARGET(simgrid_documentation
     COMMENT "Generating the SimGrid documentation..."
     DEPENDS ${DOC_SOURCES} ${DOC_FIGS} ${source_doxygen}
     COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_HOME_DIRECTORY}/doc/html
-      COMMAND ${CMAKE_COMMAND} -E make_directory   ${CMAKE_HOME_DIRECTORY}/doc/html
+    COMMAND ${CMAKE_COMMAND} -E make_directory   ${CMAKE_HOME_DIRECTORY}/doc/html
     WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/doc
-  )
+    )
 
   foreach(file ${DOC_PNGS})
     ADD_CUSTOM_COMMAND(
       TARGET simgrid_documentation
       COMMAND ${CMAKE_COMMAND} -E copy ${file} ${CMAKE_HOME_DIRECTORY}/doc/html/
-    )
+      )
   endforeach(file ${DOC_PNGS})
 
   ADD_CUSTOM_COMMAND(TARGET simgrid_documentation
     COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/doc/simgrid.css ${CMAKE_HOME_DIRECTORY}/doc/html/
-  )
-  
+    )
+
   ADD_CUSTOM_COMMAND(TARGET simgrid_documentation
-      COMMAND ${CMAKE_COMMAND} -E echo "XX Doxygen pass"
+    COMMAND ${CMAKE_COMMAND} -E echo "XX Doxygen pass"
     COMMAND ${DOXYGEN_PATH}/doxygen Doxyfile
-  WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/doc
-  )
-  
+    WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/doc
+    )
+
   ADD_CUSTOM_TARGET(pdf
     COMMAND ${CMAKE_COMMAND} -E echo "XX First pass simgrid_documentation.pdf"
     COMMAND make clean
@@ -58,13 +58,13 @@ if(DOXYGEN_PATH)
     COMMAND ${CMAKE_COMMAND} -E echo "XX Write Simgrid_documentation.pdf"
     COMMAND ${CMAKE_COMMAND} -E rename ${CMAKE_HOME_DIRECTORY}/doc/latex/refman.pdf ${CMAKE_HOME_DIRECTORY}/doc/latex/simgrid_documentation.pdf
     WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/doc/latex/
-  )
+    )
   add_dependencies(pdf simgrid_documentation)
 
   ADD_CUSTOM_TARGET(error_doxygen
     COMMAND ${CMAKE_COMMAND} -E echo "Doxygen must be at least version 1.8 to generate documentation"
     COMMAND false
-  )
+    )
 
   if(DOXYGEN_MAJOR_VERSION STRLESS "2" AND DOXYGEN_MINOR_VERSION STRLESS "8")
     add_dependencies(simgrid_documentation error_doxygen)
@@ -81,27 +81,27 @@ endif(DOXYGEN_PATH)
 
 ### TODO: LBO: CHECK IF CORRECT
 add_custom_target(sync-gforge-doc
-COMMAND chmod g+rw -R doc/
-COMMAND chmod a+rX -R doc/
-COMMAND ssh scm.gforge.inria.fr mkdir /home/groups/simgrid/htdocs/simgrid/${release_version}/ || true
-COMMAND ssh scm.gforge.inria.fr mkdir /home/groups/simgrid/htdocs/simgrid/${release_version}/user_guide/ || true
-COMMAND ssh scm.gforge.inria.fr mkdir /home/groups/simgrid/htdocs/simgrid/${release_version}/ref_guide/ || true
-COMMAND ssh scm.gforge.inria.fr mkdir /home/groups/simgrid/htdocs/simgrid/${release_version}/user_guide/html/ || true
-COMMAND ssh scm.gforge.inria.fr mkdir /home/groups/simgrid/htdocs/simgrid/${release_version}/ref_guide/html/ || true
-COMMAND rsync --verbose --cvs-exclude --compress --delete --delete-excluded --rsh=ssh --ignore-times --recursive --links --perms --times --omit-dir-times 
-doc/html/ scm.gforge.inria.fr:/home/groups/simgrid/htdocs/simgrid/${release_version}/doc/ || true
-COMMAND rsync --verbose --cvs-exclude --compress --delete --delete-excluded --rsh=ssh --ignore-times --recursive --links --perms --times --omit-dir-times 
-doc/user_guide/html/ scm.gforge.inria.fr:/home/groups/simgrid/htdocs/simgrid/${release_version}/user_guide/html/ || true
-COMMAND rsync --verbose --cvs-exclude --compress --delete --delete-excluded --rsh=ssh --ignore-times --recursive --links --perms --times --omit-dir-times 
-doc/ref_guide/html/ scm.gforge.inria.fr:/home/groups/simgrid/htdocs/simgrid/${release_version}/ref_guide/html || true
-COMMAND scp doc/user_guide/html/simgrid_modules2.png doc/user_guide/html/simgrid_modules.png doc/webcruft/simgrid_logo_2011.png  
-doc/webcruft/simgrid_logo_2011_small.png scm.gforge.inria.fr:/home/groups/simgrid/htdocs/simgrid/${release_version}/
-WORKING_DIRECTORY "${CMAKE_HOME_DIRECTORY}"
-)
+  COMMAND chmod g+rw -R doc/
+  COMMAND chmod a+rX -R doc/
+  COMMAND ssh scm.gforge.inria.fr mkdir /home/groups/simgrid/htdocs/simgrid/${release_version}/ || true
+  COMMAND ssh scm.gforge.inria.fr mkdir /home/groups/simgrid/htdocs/simgrid/${release_version}/user_guide/ || true
+  COMMAND ssh scm.gforge.inria.fr mkdir /home/groups/simgrid/htdocs/simgrid/${release_version}/ref_guide/ || true
+  COMMAND ssh scm.gforge.inria.fr mkdir /home/groups/simgrid/htdocs/simgrid/${release_version}/user_guide/html/ || true
+  COMMAND ssh scm.gforge.inria.fr mkdir /home/groups/simgrid/htdocs/simgrid/${release_version}/ref_guide/html/ || true
+  COMMAND rsync --verbose --cvs-exclude --compress --delete --delete-excluded --rsh=ssh --ignore-times --recursive --links --perms --times --omit-dir-times
+  doc/html/ scm.gforge.inria.fr:/home/groups/simgrid/htdocs/simgrid/${release_version}/doc/ || true
+  COMMAND rsync --verbose --cvs-exclude --compress --delete --delete-excluded --rsh=ssh --ignore-times --recursive --links --perms --times --omit-dir-times
+  doc/user_guide/html/ scm.gforge.inria.fr:/home/groups/simgrid/htdocs/simgrid/${release_version}/user_guide/html/ || true
+  COMMAND rsync --verbose --cvs-exclude --compress --delete --delete-excluded --rsh=ssh --ignore-times --recursive --links --perms --times --omit-dir-times
+  doc/ref_guide/html/ scm.gforge.inria.fr:/home/groups/simgrid/htdocs/simgrid/${release_version}/ref_guide/html || true
+  COMMAND scp doc/user_guide/html/simgrid_modules2.png doc/user_guide/html/simgrid_modules.png doc/webcruft/simgrid_logo_2011.png
+  doc/webcruft/simgrid_logo_2011_small.png scm.gforge.inria.fr:/home/groups/simgrid/htdocs/simgrid/${release_version}/
+  WORKING_DIRECTORY "${CMAKE_HOME_DIRECTORY}"
+  )
 add_dependencies(sync-gforge-doc simgrid_documentation)
 
 add_custom_target(sync-gforge-dtd
-COMMAND scp src/surf/simgrid.dtd scm.gforge.inria.fr:/home/groups/simgrid/htdocs/simgrid/${release_version}/simgrid.dtd
-COMMAND scp src/surf/simgrid.dtd scm.gforge.inria.fr:/home/groups/simgrid/htdocs/simgrid.dtd
-WORKING_DIRECTORY "${CMAKE_HOME_DIRECTORY}"
-)
+  COMMAND scp src/surf/simgrid.dtd scm.gforge.inria.fr:/home/groups/simgrid/htdocs/simgrid/${release_version}/simgrid.dtd
+  COMMAND scp src/surf/simgrid.dtd scm.gforge.inria.fr:/home/groups/simgrid/htdocs/simgrid.dtd
+  WORKING_DIRECTORY "${CMAKE_HOME_DIRECTORY}"
+  )
index b1fa93c..61d1a47 100644 (file)
@@ -10,14 +10,14 @@ if(WGET_PATH)
     COMMENT "Downloading the SimGrid documentation..."
     COMMAND ${WGET_PATH}/wget.exe -r -np -nH -nd http://simgrid.gforge.inria.fr/simgrid/${release_version}/doc/
     WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/doc/html
-  )
+    )
 endif(WGET_PATH)
 
 if(NSIS_PATH)
-ADD_CUSTOM_TARGET(nsis
-  COMMENT "Generating the SimGrid installor for Windows..."
-  DEPENDS simgrid simgrid gras graphicator tesh simgrid-colorizer simgrid_update_xml
-  COMMAND ${NSIS_PATH}/makensis.exe simgrid.nsi
-  WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/
-)
+  ADD_CUSTOM_TARGET(nsis
+    COMMENT "Generating the SimGrid installor for Windows..."
+    DEPENDS simgrid simgrid gras graphicator tesh simgrid-colorizer simgrid_update_xml
+    COMMAND ${NSIS_PATH}/makensis.exe simgrid.nsi
+    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/
+    )
 endif(NSIS_PATH)
\ No newline at end of file
index 1a1476b..6f84227 100644 (file)
@@ -4,49 +4,49 @@ file(GLOB_RECURSE source_doxygen
   "${CMAKE_HOME_DIRECTORY}/tools/gras/*.[chl]"
   "${CMAKE_HOME_DIRECTORY}/src/*.[chl]"
   "${CMAKE_HOME_DIRECTORY}/include/*.[chl]"
-)
+  )
 
 if(FIG2DEV_PATH)
 
-  set(DOC_PNGS 
+  set(DOC_PNGS
     ${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_logo_2011.png
     ${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_logo_2011_small.png
-  )
-  
+    )
+
   configure_file(${CMAKE_HOME_DIRECTORY}/doc/ref_guide/doxygen/RefGuideDoxyfile.in ${CMAKE_HOME_DIRECTORY}/doc/ref_guide/doxygen/RefGuideDoxyfile @ONLY)
-  
+
   ADD_CUSTOM_TARGET(ref_guide
     COMMENT "Generating the SimGrid ref guide..."
     DEPENDS ${REF_GUIDE_SOURCES} ${DOC_FIGS} ${source_doxygen}
     COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_HOME_DIRECTORY}/doc/ref_guide/html
-    COMMAND ${CMAKE_COMMAND} -E make_directory   ${CMAKE_HOME_DIRECTORY}/doc/ref_guide/html    
+    COMMAND ${CMAKE_COMMAND} -E make_directory   ${CMAKE_HOME_DIRECTORY}/doc/ref_guide/html
     WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/doc/ref_guide/
-  )
-    
+    )
+
   ADD_CUSTOM_COMMAND(TARGET ref_guide
     DEPENDS ${source_doxygen}
     COMMAND ${CMAKE_COMMAND} -E remove ${CMAKE_HOME_DIRECTORY}/doc/ref_guide/doxygen/logcategories.doc
     COMMAND ${CMAKE_HOME_DIRECTORY}/tools/doxygen/xbt_log_extract_hierarchy.pl > ${CMAKE_HOME_DIRECTORY}/doc/ref_guide/doxygen/logcategories.doc
     WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}
-  )
+    )
 
   foreach(file ${DOC_FIGS})
     string(REPLACE ".fig" ".png" tmp_file ${file})
-    string(REPLACE "${CMAKE_HOME_DIRECTORY}/doc/shared/fig/" "${CMAKE_HOME_DIRECTORY}/doc/ref_guide/html/" tmp_file ${tmp_file})    
+    string(REPLACE "${CMAKE_HOME_DIRECTORY}/doc/shared/fig/" "${CMAKE_HOME_DIRECTORY}/doc/ref_guide/html/" tmp_file ${tmp_file})
     ADD_CUSTOM_COMMAND(TARGET ref_guide
       COMMAND ${FIG2DEV_PATH}/fig2dev -Lpng -S 4 ${file} ${tmp_file}
-    )
+      )
   endforeach(file ${DOC_FIGS})
-  
+
   foreach(file ${DOC_PNGS})
     ADD_CUSTOM_COMMAND(TARGET ref_guide
       COMMAND ${CMAKE_COMMAND} -E copy ${file} ${CMAKE_HOME_DIRECTORY}/doc/ref_guide/html/
-    )
+      )
   endforeach(file ${DOC_PNGS})
 
   ADD_CUSTOM_COMMAND(TARGET ref_guide
     COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/doc/simgrid.css                          ${CMAKE_HOME_DIRECTORY}/doc/ref_guide/html/
-  )
+    )
 
   ADD_CUSTOM_COMMAND(TARGET ref_guide
     COMMAND ${FIG2DEV_PATH}/fig2dev -Lmap ${CMAKE_HOME_DIRECTORY}/doc/shared/fig/simgrid_modules.fig | perl -pe 's/imagemap/simgrid_modules/g'| perl -pe 's/<IMG/<IMG style=border:0px/g' | ${CMAKE_HOME_DIRECTORY}/tools/doxygen/fig2dev_postprocessor.pl > ${CMAKE_HOME_DIRECTORY}/doc/ref_guide/doxygen/simgrid_modules.map
@@ -56,18 +56,17 @@ if(FIG2DEV_PATH)
 
     COMMAND ${CMAKE_COMMAND} -E echo "XX Second Doxygen pass"
     COMMAND ${DOXYGEN_PATH}/doxygen RefGuideDoxyfile
-    
+
     COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_HOME_DIRECTORY}/doc/ref_guide/html/dir*
-    
 
     WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/doc/ref_guide/doxygen
-  )
-  
+    )
+
 else(DOXYGEN_PATH AND FIG2DEV_PATH)
 
   ADD_CUSTOM_TARGET(ref_guide
     COMMENT "Generating the SimGrid documentation..."
-  )
+    )
 
   ADD_CUSTOM_COMMAND(TARGET ref_guide
     COMMAND ${CMAKE_COMMAND} -E echo "DOXYGEN_PATH     = ${DOXYGEN_PATH}"
@@ -75,14 +74,12 @@ else(DOXYGEN_PATH AND FIG2DEV_PATH)
     COMMAND ${CMAKE_COMMAND} -E echo "IN ORDER TO GENERATE THE DOCUMENTATION YOU NEED ALL TOOLS !!!"
     COMMAND ${CMAKE_COMMAND} -E echo "FAIL TO MAKE SIMGRID DOCUMENTATION see previous messages for details ..."
     COMMAND false
-  )
+    )
 
-    
 endif(FIG2DEV_PATH)
 
 ##############################################################################"
 
-
 ADD_CUSTOM_TARGET(ref_guide_pdf
     COMMAND ${CMAKE_COMMAND} -E echo "XX First pass simgrid_documentation.pdf"
     COMMAND make clean
@@ -92,7 +89,7 @@ ADD_CUSTOM_TARGET(ref_guide_pdf
     COMMAND make pdf || true
     COMMAND ${CMAKE_COMMAND} -E echo "XX Write Simgrid_documentation.pdf"
     COMMAND ${CMAKE_COMMAND} -E rename ${CMAKE_HOME_DIRECTORY}/doc/latex/refman.pdf ${CMAKE_HOME_DIRECTORY}/doc/latex/simgrid_documentation.pdf
-  
+
     WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/doc/latex/
 )
 add_dependencies(ref_guide_pdf ref_guide)
index 6bdab48..91e69d6 100644 (file)
@@ -1,93 +1,92 @@
 #### Generate the html documentation for the user guide.
 
 file(GLOB_RECURSE source_doxygen
-       "${CMAKE_HOME_DIRECTORY}/tools/gras/*.[chl]"
-       "${CMAKE_HOME_DIRECTORY}/src/*.[chl]"
-       "${CMAKE_HOME_DIRECTORY}/include/*.[chl]"
-)
+  "${CMAKE_HOME_DIRECTORY}/tools/gras/*.[chl]"
+  "${CMAKE_HOME_DIRECTORY}/src/*.[chl]"
+  "${CMAKE_HOME_DIRECTORY}/include/*.[chl]"
+  )
 
 if(FIG2DEV_PATH)
-       set(DOC_PNGS 
-               ${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_logo_2011.png
-               ${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_logo_2011_small.png                
-               ${CMAKE_HOME_DIRECTORY}/doc/webcruft/poster_thumbnail.png
-               ${CMAKE_HOME_DIRECTORY}/doc/webcruft/win_install_01.png
-               ${CMAKE_HOME_DIRECTORY}/doc/webcruft/win_install_02.png
-               ${CMAKE_HOME_DIRECTORY}/doc/webcruft/win_install_03.png
-               ${CMAKE_HOME_DIRECTORY}/doc/webcruft/win_install_04.png
-               ${CMAKE_HOME_DIRECTORY}/doc/webcruft/win_install_05.png
-               ${CMAKE_HOME_DIRECTORY}/doc/webcruft/win_install_06.png
-       )
-       
-       configure_file(${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen/UserGuideDoxyfile.in ${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen/UserGuideDoxyfile @ONLY)
-       
-       ADD_CUSTOM_TARGET(user_guide
-               COMMENT "Generating the SimGrid user guide..."
-               DEPENDS ${USER_GUIDE_SOURCES} ${DOC_FIGS} ${source_doxygen}
-               COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_HOME_DIRECTORY}/doc/user_guide/html
-           COMMAND ${CMAKE_COMMAND} -E make_directory   ${CMAKE_HOME_DIRECTORY}/doc/user_guide/html            
-               WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen
-       )
-               
-       ADD_CUSTOM_COMMAND(TARGET user_guide
-               DEPENDS ${source_doxygen}
-               COMMAND ${CMAKE_COMMAND} -E remove ${CMAKE_HOME_DIRECTORY}/doc/user_guide/logcategories.doc
-               COMMAND ${CMAKE_HOME_DIRECTORY}/tools/doxygen/xbt_log_extract_hierarchy.pl > ${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen/logcategories.doc
-               WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}
-       )
-
-       foreach(file ${DOC_FIGS})
-               string(REPLACE ".fig" ".png" tmp_file ${file})
-               string(REPLACE "${CMAKE_HOME_DIRECTORY}/doc/shared/fig/" "${CMAKE_HOME_DIRECTORY}/doc/user_guide/html/" tmp_file ${tmp_file})           
-               ADD_CUSTOM_COMMAND(TARGET user_guide
-                       COMMAND ${FIG2DEV_PATH}/fig2dev -Lpng -S 4 ${file} ${tmp_file}
-               )
-       endforeach(file ${DOC_FIGS})
-       
-       foreach(file ${DOC_PNGS})
-               ADD_CUSTOM_COMMAND(TARGET user_guide
-                       COMMAND ${CMAKE_COMMAND} -E copy ${file} ${CMAKE_HOME_DIRECTORY}/doc/user_guide/html/
-               )
-       endforeach(file ${DOC_PNGS})
-
-       ADD_CUSTOM_COMMAND(TARGET user_guide
-               COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/doc/webcruft/Paje_MSG_screenshot_thn.jpg ${CMAKE_HOME_DIRECTORY}/doc/user_guide/html/
-               COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/doc/webcruft/Paje_MSG_screenshot.jpg     ${CMAKE_HOME_DIRECTORY}/doc/user_guide/html/
-               COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/doc/triva-graph_configuration.png        ${CMAKE_HOME_DIRECTORY}/doc/user_guide/html/
-               COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/doc/triva-graph_visualization.png        ${CMAKE_HOME_DIRECTORY}/doc/user_guide/html/
-               COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/doc/AS_hierarchy.png        ${CMAKE_HOME_DIRECTORY}/doc/user_guide/html/               
-               COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/doc/simgrid.css                          ${CMAKE_HOME_DIRECTORY}/doc/user_guide/html/
-       )
-       
-       ADD_CUSTOM_COMMAND(TARGET user_guide
-           COMMAND ${FIG2DEV_PATH}/fig2dev -Lmap ${CMAKE_HOME_DIRECTORY}/doc/shared/fig/simgrid_modules.fig | perl -pe 's/imagemap/simgrid_modules/g'| perl -pe 's/<IMG/<IMG style=border:0px/g' | ${CMAKE_HOME_DIRECTORY}/tools/doxygen/fig2dev_postprocessor.pl > ${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen/simgrid_modules.map
-           COMMAND ${CMAKE_COMMAND} -E echo "XX First Doxygen pass"
-               COMMAND ${DOXYGEN_PATH}/doxygen UserGuideDoxyfile
-               COMMAND ${CMAKE_HOME_DIRECTORY}/tools/doxygen/index_create.pl simgriduserguide.tag index-API.doc
-               
-               COMMAND ${CMAKE_COMMAND} -E echo "XX Second Doxygen pass"
-               COMMAND ${DOXYGEN_PATH}/doxygen UserGuideDoxyfile
-               
-               COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_HOME_DIRECTORY}/doc/user_guide/html/dir*
-                               
-               WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen
-       )
-       
+  set(DOC_PNGS
+    ${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_logo_2011.png
+    ${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_logo_2011_small.png
+    ${CMAKE_HOME_DIRECTORY}/doc/webcruft/poster_thumbnail.png
+    ${CMAKE_HOME_DIRECTORY}/doc/webcruft/win_install_01.png
+    ${CMAKE_HOME_DIRECTORY}/doc/webcruft/win_install_02.png
+    ${CMAKE_HOME_DIRECTORY}/doc/webcruft/win_install_03.png
+    ${CMAKE_HOME_DIRECTORY}/doc/webcruft/win_install_04.png
+    ${CMAKE_HOME_DIRECTORY}/doc/webcruft/win_install_05.png
+    ${CMAKE_HOME_DIRECTORY}/doc/webcruft/win_install_06.png
+    )
+
+  configure_file(${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen/UserGuideDoxyfile.in ${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen/UserGuideDoxyfile @ONLY)
+
+  ADD_CUSTOM_TARGET(user_guide
+    COMMENT "Generating the SimGrid user guide..."
+    DEPENDS ${USER_GUIDE_SOURCES} ${DOC_FIGS} ${source_doxygen}
+    COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_HOME_DIRECTORY}/doc/user_guide/html
+    COMMAND ${CMAKE_COMMAND} -E make_directory   ${CMAKE_HOME_DIRECTORY}/doc/user_guide/html
+    WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen
+    )
+
+  ADD_CUSTOM_COMMAND(TARGET user_guide
+    DEPENDS ${source_doxygen}
+    COMMAND ${CMAKE_COMMAND} -E remove ${CMAKE_HOME_DIRECTORY}/doc/user_guide/logcategories.doc
+    COMMAND ${CMAKE_HOME_DIRECTORY}/tools/doxygen/xbt_log_extract_hierarchy.pl > ${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen/logcategories.doc
+    WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}
+    )
+
+  foreach(file ${DOC_FIGS})
+    string(REPLACE ".fig" ".png" tmp_file ${file})
+    string(REPLACE "${CMAKE_HOME_DIRECTORY}/doc/shared/fig/" "${CMAKE_HOME_DIRECTORY}/doc/user_guide/html/" tmp_file ${tmp_file})
+    ADD_CUSTOM_COMMAND(TARGET user_guide
+      COMMAND ${FIG2DEV_PATH}/fig2dev -Lpng -S 4 ${file} ${tmp_file}
+      )
+  endforeach(file ${DOC_FIGS})
+
+  foreach(file ${DOC_PNGS})
+    ADD_CUSTOM_COMMAND(TARGET user_guide
+      COMMAND ${CMAKE_COMMAND} -E copy ${file} ${CMAKE_HOME_DIRECTORY}/doc/user_guide/html/
+      )
+  endforeach(file ${DOC_PNGS})
+
+  ADD_CUSTOM_COMMAND(TARGET user_guide
+    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/doc/webcruft/Paje_MSG_screenshot_thn.jpg ${CMAKE_HOME_DIRECTORY}/doc/user_guide/html/
+    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/doc/webcruft/Paje_MSG_screenshot.jpg     ${CMAKE_HOME_DIRECTORY}/doc/user_guide/html/
+    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/doc/triva-graph_configuration.png        ${CMAKE_HOME_DIRECTORY}/doc/user_guide/html/
+    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/doc/triva-graph_visualization.png        ${CMAKE_HOME_DIRECTORY}/doc/user_guide/html/
+    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/doc/AS_hierarchy.png        ${CMAKE_HOME_DIRECTORY}/doc/user_guide/html/
+    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/doc/simgrid.css                          ${CMAKE_HOME_DIRECTORY}/doc/user_guide/html/
+    )
+
+  ADD_CUSTOM_COMMAND(TARGET user_guide
+    COMMAND ${FIG2DEV_PATH}/fig2dev -Lmap ${CMAKE_HOME_DIRECTORY}/doc/shared/fig/simgrid_modules.fig | perl -pe 's/imagemap/simgrid_modules/g'| perl -pe 's/<IMG/<IMG style=border:0px/g' | ${CMAKE_HOME_DIRECTORY}/tools/doxygen/fig2dev_postprocessor.pl > ${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen/simgrid_modules.map
+    COMMAND ${CMAKE_COMMAND} -E echo "XX First Doxygen pass"
+    COMMAND ${DOXYGEN_PATH}/doxygen UserGuideDoxyfile
+    COMMAND ${CMAKE_HOME_DIRECTORY}/tools/doxygen/index_create.pl simgriduserguide.tag index-API.doc
+
+    COMMAND ${CMAKE_COMMAND} -E echo "XX Second Doxygen pass"
+    COMMAND ${DOXYGEN_PATH}/doxygen UserGuideDoxyfile
+
+    COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_HOME_DIRECTORY}/doc/user_guide/html/dir*
+
+    WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen
+    )
+
 else(FIG2DEV_PATH)
 
-       ADD_CUSTOM_TARGET(user_guide
-                       COMMENT "Generating the SimGrid user guide..."
-                       )
+  ADD_CUSTOM_TARGET(user_guide
+    COMMENT "Generating the SimGrid user guide..."
+    )
 
-       ADD_CUSTOM_COMMAND(TARGET user_guide
-                       COMMAND ${CMAKE_COMMAND} -E echo "DOXYGEN_PATH          = ${DOXYGEN_PATH}"
-                       COMMAND ${CMAKE_COMMAND} -E echo "FIG2DEV_PATH          = ${FIG2DEV_PATH}"
-                       COMMAND ${CMAKE_COMMAND} -E echo "IN ORDER TO GENERATE THE DOCUMENTATION YOU NEED ALL TOOLS !!!"
-                       COMMAND ${CMAKE_COMMAND} -E echo "FAIL TO MAKE SIMGRID DOCUMENTATION see previous messages for details ..."
-                       COMMAND false
-                       )
+  ADD_CUSTOM_COMMAND(TARGET user_guide
+    COMMAND ${CMAKE_COMMAND} -E echo "DOXYGEN_PATH             = ${DOXYGEN_PATH}"
+    COMMAND ${CMAKE_COMMAND} -E echo "FIG2DEV_PATH             = ${FIG2DEV_PATH}"
+    COMMAND ${CMAKE_COMMAND} -E echo "IN ORDER TO GENERATE THE DOCUMENTATION YOU NEED ALL TOOLS !!!"
+    COMMAND ${CMAKE_COMMAND} -E echo "FAIL TO MAKE SIMGRID DOCUMENTATION see previous messages for details ..."
+    COMMAND false
+    )
 
-               
 endif(FIG2DEV_PATH)
 
 ##############################################################################"
@@ -117,12 +116,12 @@ endif(FIG2DEV_PATH)
 #foreach(file_name ${LISTE_GTUT})
 #      file(REMOVE ${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen/tmp.curtoc)
 #      file(REMOVE ${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen/tmp.realtoc)
-#      
+#
 #      file(READ "${file_name}" file_content)
 #      string(REGEX MATCH "Table of Contents.*<hr>" valeur_line "${file_content}")
 #      string(REPLACE "\n" ";" valeur_line "${valeur_line}")
 #      string(REPLACE "\n" ";" file_content "${file_content}")
-#             
+#
 #      file(APPEND ${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen/tmp.realtoc "\n") # make sure it exists
 #      foreach(line ${file_content})
 #              string(REGEX MATCH "[\\]s?u?b?s?u?b?section.*" line2 "${line}")
@@ -138,7 +137,7 @@ endif(FIG2DEV_PATH)
 #                      file(APPEND ${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen/tmp.realtoc "${line2}\n")
 #              endif(line2 AND NOT line3)
 #      endforeach(line ${file_content})
-#      
+#
 #      file(APPEND ${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen/tmp.curtoc "\n") # make sure it exists
 #      foreach(line ${valeur_line})
 #              string(REGEX MATCH ".*ref.*" line_ok ${line})
@@ -146,7 +145,7 @@ endif(FIG2DEV_PATH)
 #                      file(APPEND ${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen/tmp.curtoc "${line_ok}\n")
 #              endif(line_ok)
 #      endforeach(line ${valeur_line})
-#      
+#
 #      exec_program("${CMAKE_COMMAND} -E compare_files ${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen/tmp.curtoc ${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen/tmp.realtoc" OUTPUT_VARIABLE compare_files)
 #      if(compare_files)
 #              message(STATUS "Wrong toc for ${file_name}. Should be:")
@@ -162,11 +161,11 @@ endif(FIG2DEV_PATH)
 #message(STATUS "Check main TOC")
 #
 #foreach(file_name ${LISTE_GTUT})
-#      file(READ "${file_name}" file_content)  
+#      file(READ "${file_name}" file_content)
 #      string(REGEX MATCH "Table of Contents.*<hr>" valeur_line "${file_content}")
 #      string(REPLACE "\n" ";" valeur_line "${valeur_line}")
 #      string(REPLACE "\n" ";" file_content "${file_content}")
-#      
+#
 #      foreach(line ${file_content})
 #              string(REGEX MATCH ".*@page.*" line2 "${line}")
 #              if(line2)
@@ -176,7 +175,7 @@ endif(FIG2DEV_PATH)
 #                      file(APPEND ${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen/tmp.realtoc "${line2}\n")
 #              endif(line2)
 #      endforeach(line ${file_content})
-#      
+#
 #      foreach(line ${valeur_line})
 #              string(REGEX MATCH ".*toc.*" line1 "${line}")
 #              string(REGEX MATCH ".*<hr>.*" line2 "${line}")
@@ -186,7 +185,7 @@ endif(FIG2DEV_PATH)
 #                      file(APPEND ${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen/tmp.realtoc "   ${line}\n")
 #              endif(NOT line1 AND NOT line2 AND NOT line3 AND NOT line4)
 #      endforeach(line ${valeur_line})
-#endforeach(file_name ${LISTE_GTUT})   
+#endforeach(file_name ${LISTE_GTUT})
 #
 #file(READ "${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen/gtut-tour.doc" file_content)
 #string(REPLACE "\n" ";" file_content "${file_content}")
@@ -196,15 +195,15 @@ endif(FIG2DEV_PATH)
 #              file(APPEND ${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen/tmp.curtoc "${line}\n")
 #      endif(line1)
 #endforeach(line ${file_content})
-#      
+#
 #exec_program("${CMAKE_COMMAND} -E compare_files ${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen/tmp.curtoc ${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen/tmp.realtoc" OUTPUT_VARIABLE compare_files)
 #if(compare_files)
 #      message(STATUS "Wrong toc for gtut-tour.doc Right one is in tmp.realtoc")
 #      exec_program("diff -u ${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen/tmp.curtoc ${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen/tmp.realtoc")
 #else(compare_files)
 #      file(REMOVE ${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen/tmp.realtoc)
-#endif(compare_files)  
-#  
+#endif(compare_files)
+#
 #file(REMOVE ${CMAKE_HOME_DIRECTORY}/doc/user_guide/doxygen/tmp.curtoc)
 
 ADD_CUSTOM_TARGET(user_guide_pdf
@@ -216,7 +215,7 @@ ADD_CUSTOM_TARGET(user_guide_pdf
     COMMAND make pdf || true
     COMMAND ${CMAKE_COMMAND} -E echo "XX Write Simgrid_documentation.pdf"
     COMMAND ${CMAKE_COMMAND} -E rename ${CMAKE_HOME_DIRECTORY}/doc/latex/refman.pdf ${CMAKE_HOME_DIRECTORY}/doc/latex/simgrid_documentation.pdf
-  
+
     WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/doc/latex/
 )
 add_dependencies(user_guide_pdf user_guide)
index 64e6aa3..cc76eba 100644 (file)
 if(enable_maintainer_mode AND NOT WIN32)
-find_program(FLEX_EXE NAMES flex)
-find_program(FLEXML_EXE NAMES flexml)
-find_program(SED_EXE NAMES sed)
-find_program(BISON_EXE NAMES bison)
-find_program(LEX_EXE NAMES lex)
-
-mark_as_advanced(BISON_EXE)
-mark_as_advanced(LEX_EXE)
-
-if(BISON_EXE AND LEX_EXE)
-  add_custom_target(automaton_generated_src ALL
-  DEPENDS ${CMAKE_HOME_DIRECTORY}/src/xbt/automaton/parserPromela.lex
-          ${CMAKE_HOME_DIRECTORY}/src/xbt/automaton/parserPromela.yacc
-  COMMENT "Generating automaton source files"
-  COMMAND ${BISON_EXE} --name-prefix=xbt_automaton_parser_ -d parserPromela.yacc
-  COMMAND ${LEX_EXE} --prefix=xbt_automaton_parser_ --outfile=automaton_lexer.yy.c parserPromela.lex
-  WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/src/xbt/automaton/
-  )
-
-  SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES
-  "${CMAKE_HOME_DIRECTORY}/src/xbt/automaton/parserPromela.tab.cacc;${CMAKE_HOME_DIRECTORY}/src/xbt/automaton/parserPromela.tab.hacc;${CMAKE_HOME_DIRECTORY}/src/xbt/automaton/automaton_parse.yy.c"
-  )
-endif(BISON_EXE AND LEX_EXE)
-
-IF(FLEX_EXE)
-       set(HAVE_FLEX 1)
-       exec_program("${FLEX_EXE} --version" OUTPUT_VARIABLE FLEX_VERSION)
-       string(REGEX MATCH "[0-9]+[.]+[0-9]+[.]+[0-9]+" FLEX_VERSION "${FLEX_VERSION}")
-       string(REGEX MATCH "^[0-9]+" FLEX_MAJOR_VERSION "${FLEX_VERSION}")
-       string(REGEX MATCH "[0-9]+[.]+[0-9]+$" FLEX_VERSION "${FLEX_VERSION}")
-       string(REGEX MATCH "^[0-9]+" FLEX_MINOR_VERSION "${FLEX_VERSION}")
-       string(REGEX MATCH "[0-9]+$" FLEX_PATCH_VERSION "${FLEX_VERSION}")
-ENDIF(FLEX_EXE)
-
-IF(FLEXML_EXE)
-       set(HAVE_FLEXML 1)
-       exec_program("${FLEXML_EXE} --version" OUTPUT_VARIABLE FLEXML_VERSION)
-       string(REGEX MATCH "[0-9]+[.]+[0-9]+" FLEXML_VERSION "${FLEXML_VERSION}")
-       string(REGEX MATCH "^[0-9]*" FLEXML_MAJOR_VERSION "${FLEXML_VERSION}")
-       string(REGEX MATCH "[0-9]*$" FLEXML_MINOR_VERSION "${FLEXML_VERSION}")
-ENDIF(FLEXML_EXE)
-
-message(STATUS "Found flex: ${FLEX_EXE}")
-message(STATUS "Found flexml: ${FLEXML_EXE}")
-message(STATUS "Found sed: ${SED_EXE}")
-
-if(HAVE_FLEXML AND HAVE_FLEX AND SED_EXE)
-
-message(STATUS "Flex version: ${FLEX_MAJOR_VERSION}.${FLEX_MINOR_VERSION}.${FLEX_PATCH_VERSION}")
-message(STATUS "Flexml version: ${FLEXML_MAJOR_VERSION}.${FLEXML_MINOR_VERSION}")
-
-set(string1  "'s/extern  *\\([^ ]*[ \\*]*\\)/XBT_PUBLIC_DATA(\\1) /'")
-set(string2  "'s/XBT_PUBLIC_DATA(\\([^)]*\\)) *\\([^(]*\\)(/XBT_PUBLIC(\\1) \\2(/'")
-set(string3  "'s/extern  *\\([^ ]*[ \\*]*\\)/XBT_PUBLIC_DATA(\\1) /'")
-set(string4  "'s/XBT_PUBLIC_DATA(\\([^)]*\\)) *\\([^(]*\\)(/XBT_PUBLIC(\\1) \\2(/'")
-set(string5  "'s/SET(DOCTYPE)/SET(ROOT_dax__adag)/'")
-set(string6  "'s/extern  *\\([^ ]*[ \\*]*\\)/XBT_PUBLIC_DATA(\\1) /'")
-set(string7  "'s/XBT_PUBLIC_DATA(\\([^)]*\\)) *\\([^(]*\\)(/XBT_PUBLIC(\\1) \\2(/'")
-set(string8  "'s/#if defined(_WIN32)/#if defined(_XBT_WIN32)/g'")
-set(string9  "'s/#include <unistd.h>/#if defined(_XBT_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(__TOS_WIN__)\\n#  ifndef __STRICT_ANSI__\\n#    include <io.h>\\n#    include <process.h>\\n#  endif\\n#else\\n#  include <unistd.h>\\n#endif/g'")
-set(string10 "'s/#if defined(_WIN32)/#if defined(_XBT_WIN32)/g'")
-set(string11 "'s/#include <unistd.h>/#if defined(_XBT_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(__TOS_WIN__)\\n#  ifndef __STRICT_ANSI__\\n#    include <io.h>\\n#    include <process.h>\\n#  endif\\n#else\\n#  include <unistd.h>\\n#endif/g'")
-set(string12 "'s/#if defined(_WIN32)/#if defined(_XBT_WIN32)/g'")
-set(string13 "'s/#include <unistd.h>/#if defined(_XBT_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(__TOS_WIN__)\\n#  ifndef __STRICT_ANSI__\\n#    include <io.h>\\n#    include <process.h>\\n#  endif\\n#else\\n#  include <unistd.h>\\n#endif/g'")
-set(string14 "'\\!^ \\* Generated [0-9/]\\{10\\} [0-9:]\\{8\\}\\.$$!d'")
-set(string15 "'s/FAIL(\"Premature EOF/if(!ETag_surfxml_include_state()) FAIL(\"Premature EOF/'")
-
-ADD_CUSTOM_COMMAND(
-       OUTPUT  ${CMAKE_HOME_DIRECTORY}/include/surf/simgrid_dtd.h
-                       ${CMAKE_HOME_DIRECTORY}/include/xbt/graphxml.h
-                       ${CMAKE_HOME_DIRECTORY}/src/simdag/dax_dtd.h
-                       ${CMAKE_HOME_DIRECTORY}/src/surf/simgrid_dtd.c
-                       ${CMAKE_HOME_DIRECTORY}/src/xbt/graphxml.c
-                       ${CMAKE_HOME_DIRECTORY}/src/xbt/datadesc/ddt_parse.yy.c
-                       ${CMAKE_HOME_DIRECTORY}/src/simdag/dax_dtd.c
-                       
-       DEPENDS ${CMAKE_HOME_DIRECTORY}/src/surf/simgrid.dtd
-                       ${CMAKE_HOME_DIRECTORY}/src/xbt/graphxml.dtd
-                       ${CMAKE_HOME_DIRECTORY}/src/xbt/datadesc/ddt_parse.yy.l
-                       ${CMAKE_HOME_DIRECTORY}/src/simdag/dax.dtd
-                                       
-       #${CMAKE_HOME_DIRECTORY}/src/surf/simgrid_dtd.l: ${CMAKE_HOME_DIRECTORY}/src/surf/simgrid.dtd
-       COMMAND ${FLEXML_EXE} --root-tags platform -b 1000000 -P surfxml --sysid=http://simgrid.gforge.inria.fr/simgrid.dtd -S src/surf/simgrid_dtd.l -L src/surf/simgrid.dtd
-       COMMAND ${SED_EXE} -i ${string14} src/surf/simgrid_dtd.l
-       COMMAND ${CMAKE_COMMAND} -E echo "src/surf/simgrid_dtd.l"
-
-       #${CMAKE_HOME_DIRECTORY}/src/xbt/graphxml.l: ${CMAKE_HOME_DIRECTORY}/src/xbt/graphxml.dtd
-       COMMAND ${FLEXML_EXE} -b 1000000 -P graphxml --sysid=graphxml.dtd -S src/xbt/graphxml.l -L src/xbt/graphxml.dtd
-       COMMAND ${SED_EXE} -i ${string14} src/xbt/graphxml.l
-       COMMAND ${CMAKE_COMMAND} -E echo "src/xbt/graphxml.l"
-
-       #${CMAKE_HOME_DIRECTORY}/src/simdag/dax_dtd.l: ${CMAKE_HOME_DIRECTORY}/src/simdag/dax.dtd
-       COMMAND ${FLEXML_EXE} -b 1000000 --root-tags adag -P dax_ --sysid=dax.dtd -S src/simdag/dax_dtd.l -L src/simdag/dax.dtd
-       COMMAND ${SED_EXE} -i ${string5} src/simdag/dax_dtd.l
-       COMMAND ${SED_EXE} -i ${string14} src/simdag/dax_dtd.l
-       COMMAND ${CMAKE_COMMAND} -E echo "src/simdag/dax_dtd.l"
-       
-       #${CMAKE_HOME_DIRECTORY}/include/surf/simgrid_dtd.h: ${CMAKE_HOME_DIRECTORY}/src/surf/simgrid.dtd
-       COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_HOME_DIRECTORY}/include/surf/simgrid.h
-       COMMAND ${FLEXML_EXE} --root-tags platform -P surfxml --sysid=http://simgrid.gforge.inria.fr/simgrid.dtd -H include/surf/simgrid_dtd.h -L src/surf/simgrid.dtd
-       COMMAND ${SED_EXE} -i ${string1} include/surf/simgrid_dtd.h
-       COMMAND ${SED_EXE} -i ${string2} include/surf/simgrid_dtd.h     
-       COMMAND ${SED_EXE} -i ${string14} include/surf/simgrid_dtd.h
-       COMMAND ${CMAKE_COMMAND} -E echo "include/surf/simgrid_dtd.h"
-
-       #${CMAKE_HOME_DIRECTORY}/include/xbt/graphxml.h: ${CMAKE_HOME_DIRECTORY}/src/xbt/graphxml.dtd
-       COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_HOME_DIRECTORY}/include/xbt/graphxml.h
-       COMMAND ${FLEXML_EXE} -P graphxml --sysid=graphxml.dtd -H include/xbt/graphxml.h -L src/xbt/graphxml.dtd
-       COMMAND ${SED_EXE} -i ${string3} include/xbt/graphxml.h 
-       COMMAND ${SED_EXE} -i ${string4} include/xbt/graphxml.h
-       COMMAND ${SED_EXE} -i ${string14} include/xbt/graphxml.h
-       COMMAND ${CMAKE_COMMAND} -E echo "include/xbt/graphxml.h"
-
-       #${CMAKE_HOME_DIRECTORY}/src/simdag/dax_dtd.h: ${CMAKE_HOME_DIRECTORY}/src/simdag/dax.dtd
-       COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_HOME_DIRECTORY}/src/simdag/dax_dtd.h
-       COMMAND ${FLEXML_EXE} --root-tags adag -P dax_ --sysid=dax.dtd -H src/simdag/dax_dtd.h -L src/simdag/dax.dtd
-       COMMAND ${SED_EXE} -i ${string6} src/simdag/dax_dtd.h   
-       COMMAND ${SED_EXE} -i ${string7} src/simdag/dax_dtd.h
-       COMMAND ${SED_EXE} -i ${string14} src/simdag/dax_dtd.h
-       COMMAND ${CMAKE_COMMAND} -E echo "src/simdag/dax_dtd.h"
-       
-       #surf/simgrid_dtd.c: surf/simgrid_dtd.l
-       COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_HOME_DIRECTORY}/src/surf/simgrid_dtd.c
-       COMMAND ${SED_EXE} -i ${string8} src/surf/simgrid_dtd.l
-       COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_HOME_DIRECTORY}/src/surf
-       COMMAND ${FLEX_EXE} -o src/surf/simgrid_dtd.c -Psurf_parse_ --noline src/surf/simgrid_dtd.l
-       COMMAND ${SED_EXE} -i ${string9} src/surf/simgrid_dtd.c
-       COMMAND ${SED_EXE} -i ${string15} src/surf/simgrid_dtd.c
-       COMMAND ${CMAKE_COMMAND} -E echo "surf/simgrid_dtd.c"
-
-       #xbt/graphxml.c: xbt/graphxml.l
-       COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_HOME_DIRECTORY}/src/xbt/graphxml.c
-       COMMAND ${SED_EXE} -i ${string10} src/xbt/graphxml.l    
-       COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_HOME_DIRECTORY}/src/xbt
-       COMMAND ${FLEX_EXE} -o src/xbt/graphxml.c -Pxbt_graph_parse_ --noline src/xbt/graphxml.l
-       COMMAND ${SED_EXE} -i ${string11} src/xbt/graphxml.c
-       COMMAND ${CMAKE_COMMAND} -E echo "xbt/graphxml.c"
-
-       # src/xbt/datadesc/ddt_parse.yy.c: src/xbt/datadesc/ddt_parse.yy.l
-       COMMAND ${FLEX_EXE} -o src/xbt/datadesc/ddt_parse.yy.c -Pxbt_ddt_parse_ --noline src/xbt/datadesc/ddt_parse.yy.l
-       COMMAND ${CMAKE_COMMAND} -E echo "xbt/datadesc/ddt_parse.yy.c"
-
-       #simdag/dax_dtd.c: simdag/dax_dtd.l
-       COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_HOME_DIRECTORY}/src/simdag/dax_dtd.c
-       COMMAND ${SED_EXE} -i ${string12} src/simdag/dax_dtd.l
-       COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_HOME_DIRECTORY}/src/simdag
-       COMMAND ${FLEX_EXE} -o src/simdag/dax_dtd.c -Pdax_ --noline src/simdag/dax_dtd.l
-       COMMAND ${SED_EXE} -i ${string13} src/simdag/dax_dtd.c
-       COMMAND ${CMAKE_COMMAND} -E echo "simdag/dax_dtd.c"
-       
-       WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}
-       COMMENT "Generating files in maintainer mode..."
-)
-
-       add_custom_target(maintainer_files
-                                               DEPENDS ${CMAKE_HOME_DIRECTORY}/include/surf/simgrid_dtd.h
-                                                               ${CMAKE_HOME_DIRECTORY}/include/xbt/graphxml.h
-                                                               ${CMAKE_HOME_DIRECTORY}/src/simdag/dax_dtd.h
-                                                               ${CMAKE_HOME_DIRECTORY}/src/surf/simgrid_dtd.c
-                                                               ${CMAKE_HOME_DIRECTORY}/src/xbt/graphxml.c
-                                                               ${CMAKE_HOME_DIRECTORY}/src/xbt/datadesc/ddt_parse.yy.c
-                                                               ${CMAKE_HOME_DIRECTORY}/src/simdag/dax_dtd.c
-                                               )
-
-else(HAVE_FLEXML AND HAVE_FLEX  AND SED_EXE)
-       if(NOT HAVE_FLEXML)
-               message(STATUS "Error : Install flexml before use maintainer mode.")
-       endif(NOT HAVE_FLEXML)
-       if(NOT HAVE_FLEX)
-               message(STATUS "Error : Install flex before use maintainer mode.")
-       endif(NOT HAVE_FLEX)
-       if(NOT SED_EXE)
-               message(STATUS "Error : Install sed before use maintainer mode.")
-       endif(NOT SED_EXE)
-       
-       message(FATAL_ERROR STATUS "Error : Need to install all tools for maintainer mode !!!")
-endif(HAVE_FLEXML AND HAVE_FLEX  AND SED_EXE)
+  find_program(FLEX_EXE NAMES flex)
+  find_program(FLEXML_EXE NAMES flexml)
+  find_program(SED_EXE NAMES sed)
+  find_program(BISON_EXE NAMES bison)
+  find_program(LEX_EXE NAMES lex)
+
+  mark_as_advanced(BISON_EXE)
+  mark_as_advanced(LEX_EXE)
+
+  if(BISON_EXE AND LEX_EXE)
+    add_custom_target(automaton_generated_src ALL
+      DEPENDS ${CMAKE_HOME_DIRECTORY}/src/xbt/automaton/parserPromela.lex
+      ${CMAKE_HOME_DIRECTORY}/src/xbt/automaton/parserPromela.yacc
+      COMMENT "Generating automaton source files"
+      COMMAND ${BISON_EXE} --name-prefix=xbt_automaton_parser_ -d parserPromela.yacc
+      COMMAND ${LEX_EXE} --prefix=xbt_automaton_parser_ --outfile=automaton_lexer.yy.c parserPromela.lex
+      WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/src/xbt/automaton/
+      )
+
+    SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES
+      "${CMAKE_HOME_DIRECTORY}/src/xbt/automaton/parserPromela.tab.cacc;${CMAKE_HOME_DIRECTORY}/src/xbt/automaton/parserPromela.tab.hacc;${CMAKE_HOME_DIRECTORY}/src/xbt/automaton/automaton_parse.yy.c"
+      )
+  endif(BISON_EXE AND LEX_EXE)
+
+  IF(FLEX_EXE)
+    set(HAVE_FLEX 1)
+    exec_program("${FLEX_EXE} --version" OUTPUT_VARIABLE FLEX_VERSION)
+    string(REGEX MATCH "[0-9]+[.]+[0-9]+[.]+[0-9]+" FLEX_VERSION "${FLEX_VERSION}")
+    string(REGEX MATCH "^[0-9]+" FLEX_MAJOR_VERSION "${FLEX_VERSION}")
+    string(REGEX MATCH "[0-9]+[.]+[0-9]+$" FLEX_VERSION "${FLEX_VERSION}")
+    string(REGEX MATCH "^[0-9]+" FLEX_MINOR_VERSION "${FLEX_VERSION}")
+    string(REGEX MATCH "[0-9]+$" FLEX_PATCH_VERSION "${FLEX_VERSION}")
+  ENDIF(FLEX_EXE)
+
+  IF(FLEXML_EXE)
+    set(HAVE_FLEXML 1)
+    exec_program("${FLEXML_EXE} --version" OUTPUT_VARIABLE FLEXML_VERSION)
+    string(REGEX MATCH "[0-9]+[.]+[0-9]+" FLEXML_VERSION "${FLEXML_VERSION}")
+    string(REGEX MATCH "^[0-9]*" FLEXML_MAJOR_VERSION "${FLEXML_VERSION}")
+    string(REGEX MATCH "[0-9]*$" FLEXML_MINOR_VERSION "${FLEXML_VERSION}")
+  ENDIF(FLEXML_EXE)
+
+  message(STATUS "Found flex: ${FLEX_EXE}")
+  message(STATUS "Found flexml: ${FLEXML_EXE}")
+  message(STATUS "Found sed: ${SED_EXE}")
+
+  if(HAVE_FLEXML AND HAVE_FLEX AND SED_EXE)
+
+    message(STATUS "Flex version: ${FLEX_MAJOR_VERSION}.${FLEX_MINOR_VERSION}.${FLEX_PATCH_VERSION}")
+    message(STATUS "Flexml version: ${FLEXML_MAJOR_VERSION}.${FLEXML_MINOR_VERSION}")
+
+    set(string1  "'s/extern  *\\([^ ]*[ \\*]*\\)/XBT_PUBLIC_DATA(\\1) /'")
+    set(string2  "'s/XBT_PUBLIC_DATA(\\([^)]*\\)) *\\([^(]*\\)(/XBT_PUBLIC(\\1) \\2(/'")
+    set(string3  "'s/extern  *\\([^ ]*[ \\*]*\\)/XBT_PUBLIC_DATA(\\1) /'")
+    set(string4  "'s/XBT_PUBLIC_DATA(\\([^)]*\\)) *\\([^(]*\\)(/XBT_PUBLIC(\\1) \\2(/'")
+    set(string5  "'s/SET(DOCTYPE)/SET(ROOT_dax__adag)/'")
+    set(string6  "'s/extern  *\\([^ ]*[ \\*]*\\)/XBT_PUBLIC_DATA(\\1) /'")
+    set(string7  "'s/XBT_PUBLIC_DATA(\\([^)]*\\)) *\\([^(]*\\)(/XBT_PUBLIC(\\1) \\2(/'")
+    set(string8  "'s/#if defined(_WIN32)/#if defined(_XBT_WIN32)/g'")
+    set(string9  "'s/#include <unistd.h>/#if defined(_XBT_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(__TOS_WIN__)\\n#  ifndef __STRICT_ANSI__\\n#    include <io.h>\\n#    include <process.h>\\n#  endif\\n#else\\n#  include <unistd.h>\\n#endif/g'")
+    set(string10 "'s/#if defined(_WIN32)/#if defined(_XBT_WIN32)/g'")
+    set(string11 "'s/#include <unistd.h>/#if defined(_XBT_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(__TOS_WIN__)\\n#  ifndef __STRICT_ANSI__\\n#    include <io.h>\\n#    include <process.h>\\n#  endif\\n#else\\n#  include <unistd.h>\\n#endif/g'")
+    set(string12 "'s/#if defined(_WIN32)/#if defined(_XBT_WIN32)/g'")
+    set(string13 "'s/#include <unistd.h>/#if defined(_XBT_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(__TOS_WIN__)\\n#  ifndef __STRICT_ANSI__\\n#    include <io.h>\\n#    include <process.h>\\n#  endif\\n#else\\n#  include <unistd.h>\\n#endif/g'")
+    set(string14 "'\\!^ \\* Generated [0-9/]\\{10\\} [0-9:]\\{8\\}\\.$$!d'")
+    set(string15 "'s/FAIL(\"Premature EOF/if(!ETag_surfxml_include_state()) FAIL(\"Premature EOF/'")
+
+    ADD_CUSTOM_COMMAND(
+      OUTPUT   ${CMAKE_HOME_DIRECTORY}/include/surf/simgrid_dtd.h
+      ${CMAKE_HOME_DIRECTORY}/include/xbt/graphxml.h
+      ${CMAKE_HOME_DIRECTORY}/src/simdag/dax_dtd.h
+      ${CMAKE_HOME_DIRECTORY}/src/surf/simgrid_dtd.c
+      ${CMAKE_HOME_DIRECTORY}/src/xbt/graphxml.c
+      ${CMAKE_HOME_DIRECTORY}/src/xbt/datadesc/ddt_parse.yy.c
+      ${CMAKE_HOME_DIRECTORY}/src/simdag/dax_dtd.c
+
+      DEPENDS  ${CMAKE_HOME_DIRECTORY}/src/surf/simgrid.dtd
+      ${CMAKE_HOME_DIRECTORY}/src/xbt/graphxml.dtd
+      ${CMAKE_HOME_DIRECTORY}/src/xbt/datadesc/ddt_parse.yy.l
+      ${CMAKE_HOME_DIRECTORY}/src/simdag/dax.dtd
+
+      #${CMAKE_HOME_DIRECTORY}/src/surf/simgrid_dtd.l: ${CMAKE_HOME_DIRECTORY}/src/surf/simgrid.dtd
+      COMMAND ${FLEXML_EXE} --root-tags platform -b 1000000 -P surfxml --sysid=http://simgrid.gforge.inria.fr/simgrid.dtd -S src/surf/simgrid_dtd.l -L src/surf/simgrid.dtd
+      COMMAND ${SED_EXE} -i ${string14} src/surf/simgrid_dtd.l
+      COMMAND ${CMAKE_COMMAND} -E echo "src/surf/simgrid_dtd.l"
+
+      #${CMAKE_HOME_DIRECTORY}/src/xbt/graphxml.l: ${CMAKE_HOME_DIRECTORY}/src/xbt/graphxml.dtd
+      COMMAND ${FLEXML_EXE} -b 1000000 -P graphxml --sysid=graphxml.dtd -S src/xbt/graphxml.l -L src/xbt/graphxml.dtd
+      COMMAND ${SED_EXE} -i ${string14} src/xbt/graphxml.l
+      COMMAND ${CMAKE_COMMAND} -E echo "src/xbt/graphxml.l"
+
+      #${CMAKE_HOME_DIRECTORY}/src/simdag/dax_dtd.l: ${CMAKE_HOME_DIRECTORY}/src/simdag/dax.dtd
+      COMMAND ${FLEXML_EXE} -b 1000000 --root-tags adag -P dax_ --sysid=dax.dtd -S src/simdag/dax_dtd.l -L src/simdag/dax.dtd
+      COMMAND ${SED_EXE} -i ${string5} src/simdag/dax_dtd.l
+      COMMAND ${SED_EXE} -i ${string14} src/simdag/dax_dtd.l
+      COMMAND ${CMAKE_COMMAND} -E echo "src/simdag/dax_dtd.l"
+
+      #${CMAKE_HOME_DIRECTORY}/include/surf/simgrid_dtd.h: ${CMAKE_HOME_DIRECTORY}/src/surf/simgrid.dtd
+      COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_HOME_DIRECTORY}/include/surf/simgrid.h
+      COMMAND ${FLEXML_EXE} --root-tags platform -P surfxml --sysid=http://simgrid.gforge.inria.fr/simgrid.dtd -H include/surf/simgrid_dtd.h -L src/surf/simgrid.dtd
+      COMMAND ${SED_EXE} -i ${string1} include/surf/simgrid_dtd.h
+      COMMAND ${SED_EXE} -i ${string2} include/surf/simgrid_dtd.h
+      COMMAND ${SED_EXE} -i ${string14} include/surf/simgrid_dtd.h
+      COMMAND ${CMAKE_COMMAND} -E echo "include/surf/simgrid_dtd.h"
+
+      #${CMAKE_HOME_DIRECTORY}/include/xbt/graphxml.h: ${CMAKE_HOME_DIRECTORY}/src/xbt/graphxml.dtd
+      COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_HOME_DIRECTORY}/include/xbt/graphxml.h
+      COMMAND ${FLEXML_EXE} -P graphxml --sysid=graphxml.dtd -H include/xbt/graphxml.h -L src/xbt/graphxml.dtd
+      COMMAND ${SED_EXE} -i ${string3} include/xbt/graphxml.h
+      COMMAND ${SED_EXE} -i ${string4} include/xbt/graphxml.h
+      COMMAND ${SED_EXE} -i ${string14} include/xbt/graphxml.h
+      COMMAND ${CMAKE_COMMAND} -E echo "include/xbt/graphxml.h"
+
+      #${CMAKE_HOME_DIRECTORY}/src/simdag/dax_dtd.h: ${CMAKE_HOME_DIRECTORY}/src/simdag/dax.dtd
+      COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_HOME_DIRECTORY}/src/simdag/dax_dtd.h
+      COMMAND ${FLEXML_EXE} --root-tags adag -P dax_ --sysid=dax.dtd -H src/simdag/dax_dtd.h -L src/simdag/dax.dtd
+      COMMAND ${SED_EXE} -i ${string6} src/simdag/dax_dtd.h
+      COMMAND ${SED_EXE} -i ${string7} src/simdag/dax_dtd.h
+      COMMAND ${SED_EXE} -i ${string14} src/simdag/dax_dtd.h
+      COMMAND ${CMAKE_COMMAND} -E echo "src/simdag/dax_dtd.h"
+
+      #surf/simgrid_dtd.c: surf/simgrid_dtd.l
+      COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_HOME_DIRECTORY}/src/surf/simgrid_dtd.c
+      COMMAND ${SED_EXE} -i ${string8} src/surf/simgrid_dtd.l
+      COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_HOME_DIRECTORY}/src/surf
+      COMMAND ${FLEX_EXE} -o src/surf/simgrid_dtd.c -Psurf_parse_ --noline src/surf/simgrid_dtd.l
+      COMMAND ${SED_EXE} -i ${string9} src/surf/simgrid_dtd.c
+      COMMAND ${SED_EXE} -i ${string15} src/surf/simgrid_dtd.c
+      COMMAND ${CMAKE_COMMAND} -E echo "surf/simgrid_dtd.c"
+
+      #xbt/graphxml.c: xbt/graphxml.l
+      COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_HOME_DIRECTORY}/src/xbt/graphxml.c
+      COMMAND ${SED_EXE} -i ${string10} src/xbt/graphxml.l
+      COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_HOME_DIRECTORY}/src/xbt
+      COMMAND ${FLEX_EXE} -o src/xbt/graphxml.c -Pxbt_graph_parse_ --noline src/xbt/graphxml.l
+      COMMAND ${SED_EXE} -i ${string11} src/xbt/graphxml.c
+      COMMAND ${CMAKE_COMMAND} -E echo "xbt/graphxml.c"
+
+      # src/xbt/datadesc/ddt_parse.yy.c: src/xbt/datadesc/ddt_parse.yy.l
+      COMMAND ${FLEX_EXE} -o src/xbt/datadesc/ddt_parse.yy.c -Pxbt_ddt_parse_ --noline src/xbt/datadesc/ddt_parse.yy.l
+      COMMAND ${CMAKE_COMMAND} -E echo "xbt/datadesc/ddt_parse.yy.c"
+
+      #simdag/dax_dtd.c: simdag/dax_dtd.l
+      COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_HOME_DIRECTORY}/src/simdag/dax_dtd.c
+      COMMAND ${SED_EXE} -i ${string12} src/simdag/dax_dtd.l
+      COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_HOME_DIRECTORY}/src/simdag
+      COMMAND ${FLEX_EXE} -o src/simdag/dax_dtd.c -Pdax_ --noline src/simdag/dax_dtd.l
+      COMMAND ${SED_EXE} -i ${string13} src/simdag/dax_dtd.c
+      COMMAND ${CMAKE_COMMAND} -E echo "simdag/dax_dtd.c"
+
+      WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}
+      COMMENT "Generating files in maintainer mode..."
+      )
+
+    add_custom_target(maintainer_files
+      DEPENDS ${CMAKE_HOME_DIRECTORY}/include/surf/simgrid_dtd.h
+      ${CMAKE_HOME_DIRECTORY}/include/xbt/graphxml.h
+      ${CMAKE_HOME_DIRECTORY}/src/simdag/dax_dtd.h
+      ${CMAKE_HOME_DIRECTORY}/src/surf/simgrid_dtd.c
+      ${CMAKE_HOME_DIRECTORY}/src/xbt/graphxml.c
+      ${CMAKE_HOME_DIRECTORY}/src/xbt/datadesc/ddt_parse.yy.c
+      ${CMAKE_HOME_DIRECTORY}/src/simdag/dax_dtd.c
+      )
+
+  else(HAVE_FLEXML AND HAVE_FLEX  AND SED_EXE)
+    if(NOT HAVE_FLEXML)
+      message(STATUS "Error : Install flexml before use maintainer mode.")
+    endif(NOT HAVE_FLEXML)
+    if(NOT HAVE_FLEX)
+      message(STATUS "Error : Install flex before use maintainer mode.")
+    endif(NOT HAVE_FLEX)
+    if(NOT SED_EXE)
+      message(STATUS "Error : Install sed before use maintainer mode.")
+    endif(NOT SED_EXE)
+
+    message(FATAL_ERROR STATUS "Error : Need to install all tools for maintainer mode !!!")
+  endif(HAVE_FLEXML AND HAVE_FLEX  AND SED_EXE)
 
 endif(enable_maintainer_mode AND NOT WIN32)
-
index ee25e10..f3f0a2b 100644 (file)
@@ -1,80 +1,80 @@
-###################################################################\r
-### Load all files declaring binaries (tools, examples and tests) #\r
-###################################################################\r
-##################################################################\r
-# Those CMakelists are just added to define files in dist    #\r
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/lua)\r
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg)\r
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/xbt)\r
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite)\r
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/gras)\r
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/tools)\r
-##################################################################\r
-\r
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/tools/gras)\r
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/tools/tesh)\r
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/tools/graphicator/)\r
-\r
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/testsuite/xbt)\r
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/testsuite/surf)\r
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/xbt)\r
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/gras/datadesc)\r
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/gras/msg_handle)\r
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/gras/empty_main)\r
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/gras/small_sleep)\r
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/gras/numerous_rpc)\r
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/simdag)\r
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/network)\r
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/network/p2p)\r
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/network/mxn)\r
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/partask)\r
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms)\r
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/msg)\r
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/msg/trace)\r
-\r
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/gras/ping)\r
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/gras/rpc)\r
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/gras/spawn)\r
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/gras/timer)\r
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/gras/chrono)\r
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/gras/mutual_exclusion/simple_token)\r
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/gras/mmrpc)\r
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/gras/all2all)\r
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/gras/pmm)\r
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/gras/synchro)\r
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/gras/properties)\r
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/gras/console)\r
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/properties)\r
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/actions)\r
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/migration)\r
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/sendrecv)\r
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/suspend)\r
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/parallel_task)\r
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/priority)\r
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave)\r
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/icomms)\r
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/chord)\r
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/token_ring)\r
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/pmm)\r
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/start_kill_time)\r
-\r
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/io)\r
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/cloud)\r
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/gpu)\r
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/tracing)\r
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/mc)\r
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets)\r
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/ns3)\r
-\r
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/amok/bandwidth)\r
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/amok/saturate)\r
-\r
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/simdag)\r
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/simdag/dax)\r
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/simdag/goal)\r
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/simdag/dot)\r
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/simdag/metaxml)\r
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/simdag/properties)\r
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/simdag/scheduling)\r
-\r
+###################################################################
+### 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}/teshsuite)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/gras)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/tools)
+##################################################################
+
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/tools/gras)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/tools/tesh)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/tools/graphicator/)
+
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/testsuite/xbt)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/testsuite/surf)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/xbt)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/gras/datadesc)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/gras/msg_handle)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/gras/empty_main)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/gras/small_sleep)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/gras/numerous_rpc)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/simdag)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/network)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/network/p2p)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/network/mxn)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/partask)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/msg)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/msg/trace)
+
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/gras/ping)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/gras/rpc)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/gras/spawn)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/gras/timer)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/gras/chrono)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/gras/mutual_exclusion/simple_token)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/gras/mmrpc)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/gras/all2all)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/gras/pmm)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/gras/synchro)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/gras/properties)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/gras/console)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/properties)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/actions)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/migration)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/sendrecv)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/suspend)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/parallel_task)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/priority)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/icomms)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/chord)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/token_ring)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/pmm)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/start_kill_time)
+
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/io)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/cloud)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/gpu)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/tracing)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/mc)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/ns3)
+
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/amok/bandwidth)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/amok/saturate)
+
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/simdag)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/simdag/dax)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/simdag/goal)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/simdag/dot)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/simdag/metaxml)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/simdag/properties)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/simdag/scheduling)
+
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/smpi)
index 52d66f3..166429a 100644 (file)
@@ -15,42 +15,42 @@ add_library(gras SHARED ${gras_sources})
 set_target_properties(gras PROPERTIES VERSION ${libgras_version})
 
 if(enable_lib_static)
-       add_library(simgrid_static STATIC ${simgrid_sources})   
+  add_library(simgrid_static STATIC ${simgrid_sources})
 endif(enable_lib_static)
 
 if(enable_smpi)
-       add_library(smpi SHARED ${SMPI_SRC})
-       set_target_properties(smpi PROPERTIES VERSION ${libsmpi_version})
-       if(enable_lib_static)
-               add_library(smpi_static STATIC ${SMPI_SRC})     
-       endif(enable_lib_static)
+  add_library(smpi SHARED ${SMPI_SRC})
+  set_target_properties(smpi PROPERTIES VERSION ${libsmpi_version})
+  if(enable_lib_static)
+    add_library(smpi_static STATIC ${SMPI_SRC})
+  endif(enable_lib_static)
 endif(enable_smpi)
 
 add_dependencies(gras maintainer_files)
-add_dependencies(simgrid maintainer_files)                             
+add_dependencies(simgrid maintainer_files)
 
 # if supernovaeing, we need some depends to make sure that the source gets generated
 if (enable_supernovae)
-       add_dependencies(simgrid ${CMAKE_CURRENT_BINARY_DIR}/src/supernovae_sg.c)
-       if(enable_lib_static)
-               add_dependencies(simgrid_static ${CMAKE_CURRENT_BINARY_DIR}/src/supernovae_sg.c)
-       endif(enable_lib_static)
-       add_dependencies(gras ${CMAKE_CURRENT_BINARY_DIR}/src/supernovae_gras.c)
-
-       if(enable_smpi)
-               add_dependencies(smpi ${CMAKE_CURRENT_BINARY_DIR}/src/supernovae_smpi.c)
-               if(enable_lib_static)
-                       add_dependencies(smpi_static ${CMAKE_CURRENT_BINARY_DIR}/src/supernovae_smpi.c)
-               endif(enable_lib_static)
-       endif(enable_smpi)
-endif(enable_supernovae)       
+  add_dependencies(simgrid ${CMAKE_CURRENT_BINARY_DIR}/src/supernovae_sg.c)
+  if(enable_lib_static)
+    add_dependencies(simgrid_static ${CMAKE_CURRENT_BINARY_DIR}/src/supernovae_sg.c)
+  endif(enable_lib_static)
+  add_dependencies(gras ${CMAKE_CURRENT_BINARY_DIR}/src/supernovae_gras.c)
+
+  if(enable_smpi)
+    add_dependencies(smpi ${CMAKE_CURRENT_BINARY_DIR}/src/supernovae_smpi.c)
+    if(enable_lib_static)
+      add_dependencies(smpi_static ${CMAKE_CURRENT_BINARY_DIR}/src/supernovae_smpi.c)
+    endif(enable_lib_static)
+  endif(enable_smpi)
+endif(enable_supernovae)
 
 # Compute the dependencies of GRAS
 ##################################
 set(GRAS_DEP "-lm -pthread")
 
 if(HAVE_POSIX_GETTIME)
-       SET(GRAS_DEP "${GRAS_DEP} -lrt")
+  SET(GRAS_DEP "${GRAS_DEP} -lrt")
 endif(HAVE_POSIX_GETTIME)
 
 # the following is probably unneed since it kills the previous
@@ -58,9 +58,9 @@ endif(HAVE_POSIX_GETTIME)
 # My guess is that pthread is never true [Mt]
 # FIXME: KILLME if we get a working windows with that?
 if(with_context MATCHES windows)
-if(pthread)
-               SET(GRAS_DEP "msg")
-endif(pthread)
+  if(pthread)
+    SET(GRAS_DEP "msg")
+  endif(pthread)
 endif(with_context MATCHES windows)
 target_link_libraries(gras     ${GRAS_DEP})
 
@@ -69,63 +69,63 @@ target_link_libraries(gras  ${GRAS_DEP})
 set(SIMGRID_DEP "-lm -lpcre")
 
 if(pthread)
-       if(${CONTEXT_THREADS})
-               SET(SIMGRID_DEP "${SIMGRID_DEP} -pthread")
-       endif(${CONTEXT_THREADS})       
+  if(${CONTEXT_THREADS})
+    SET(SIMGRID_DEP "${SIMGRID_DEP} -pthread")
+  endif(${CONTEXT_THREADS})
 endif(pthread)
 
-if(HAVE_LUA)     
-    ADD_CUSTOM_TARGET(link_simgrid_lua ALL
-      DEPENDS  simgrid
-                       ${CMAKE_BINARY_DIR}/examples/lua/simgrid.${LIB_EXE}
-                               ${CMAKE_BINARY_DIR}/examples/msg/masterslave/simgrid.${LIB_EXE}
-                               ${CMAKE_BINARY_DIR}/examples/simdag/simgrid.${LIB_EXE}
-       )
-       add_custom_command(
-               OUTPUT  ${CMAKE_BINARY_DIR}/examples/lua/simgrid.${LIB_EXE}
-                               ${CMAKE_BINARY_DIR}/examples/msg/masterslave/simgrid.${LIB_EXE}
-                               ${CMAKE_BINARY_DIR}/examples/simdag/simgrid.${LIB_EXE}
-               COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_BINARY_DIR}/examples/lua/simgrid.${LIB_EXE} # if it exists, creating the link fails. So cleanup before hand
-               COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/examples/lua/
-               COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_BINARY_DIR}/lib/libsimgrid.${LIB_EXE} ${CMAKE_BINARY_DIR}/examples/lua/simgrid.${LIB_EXE} #for test
-               
-               COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_BINARY_DIR}/examples/msg/masterslave/simgrid.${LIB_EXE} # if it exists, creating the link fails. So cleanup before hand
-               COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/examples/msg/masterslave/
-               COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_BINARY_DIR}/lib/libsimgrid.${LIB_EXE} ${CMAKE_BINARY_DIR}/examples/msg/masterslave/simgrid.${LIB_EXE} #for test
-               
-               COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_BINARY_DIR}/examples/simdag/simgrid.${LIB_EXE} # if it exists, creating the link fails. So cleanup before hand
-               COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/examples/simdag/
-               COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_BINARY_DIR}/lib/libsimgrid.${LIB_EXE} ${CMAKE_BINARY_DIR}/examples/simdag/simgrid.${LIB_EXE} #for test                       
-       )
-       SET(SIMGRID_DEP "${SIMGRID_DEP} -l${LIB_LUA_NAME}")       
+if(HAVE_LUA)
+  ADD_CUSTOM_TARGET(link_simgrid_lua ALL
+    DEPENDS    simgrid
+    ${CMAKE_BINARY_DIR}/examples/lua/simgrid.${LIB_EXE}
+    ${CMAKE_BINARY_DIR}/examples/msg/masterslave/simgrid.${LIB_EXE}
+    ${CMAKE_BINARY_DIR}/examples/simdag/simgrid.${LIB_EXE}
+    )
+  add_custom_command(
+    OUTPUT     ${CMAKE_BINARY_DIR}/examples/lua/simgrid.${LIB_EXE}
+    ${CMAKE_BINARY_DIR}/examples/msg/masterslave/simgrid.${LIB_EXE}
+    ${CMAKE_BINARY_DIR}/examples/simdag/simgrid.${LIB_EXE}
+    COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_BINARY_DIR}/examples/lua/simgrid.${LIB_EXE} # if it exists, creating the link fails. So cleanup before hand
+    COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/examples/lua/
+    COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_BINARY_DIR}/lib/libsimgrid.${LIB_EXE} ${CMAKE_BINARY_DIR}/examples/lua/simgrid.${LIB_EXE} #for test
+
+    COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_BINARY_DIR}/examples/msg/masterslave/simgrid.${LIB_EXE} # if it exists, creating the link fails. So cleanup before hand
+    COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/examples/msg/masterslave/
+    COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_BINARY_DIR}/lib/libsimgrid.${LIB_EXE} ${CMAKE_BINARY_DIR}/examples/msg/masterslave/simgrid.${LIB_EXE} #for test
+
+    COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_BINARY_DIR}/examples/simdag/simgrid.${LIB_EXE} # if it exists, creating the link fails. So cleanup before hand
+    COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/examples/simdag/
+    COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_BINARY_DIR}/lib/libsimgrid.${LIB_EXE} ${CMAKE_BINARY_DIR}/examples/simdag/simgrid.${LIB_EXE} #for test
+    )
+  SET(SIMGRID_DEP "${SIMGRID_DEP} -l${LIB_LUA_NAME}")
 endif(HAVE_LUA)
 
 if(HAVE_GRAPHVIZ)
-    if(HAVE_CGRAPH_LIB)
-           SET(SIMGRID_DEP "${SIMGRID_DEP} -lcgraph")
-       else(HAVE_CGRAPH_LIB)
-        if(HAVE_AGRAPH_LIB)
-           SET(SIMGRID_DEP "${SIMGRID_DEP} -lagraph -lcdt")
-        endif(HAVE_AGRAPH_LIB) 
-    endif(HAVE_CGRAPH_LIB)         
+  if(HAVE_CGRAPH_LIB)
+    SET(SIMGRID_DEP "${SIMGRID_DEP} -lcgraph")
+  else(HAVE_CGRAPH_LIB)
+    if(HAVE_AGRAPH_LIB)
+      SET(SIMGRID_DEP "${SIMGRID_DEP} -lagraph -lcdt")
+    endif(HAVE_AGRAPH_LIB)
+  endif(HAVE_CGRAPH_LIB)
 endif(HAVE_GRAPHVIZ)
 
 if(HAVE_GTNETS)
-       SET(SIMGRID_DEP "${SIMGRID_DEP} -lgtnets")
+  SET(SIMGRID_DEP "${SIMGRID_DEP} -lgtnets")
 endif(HAVE_GTNETS)
 
 if(HAVE_NS3)
-    if(${NS3_VERSION} EQUAL 310)
-           SET(SIMGRID_DEP "${SIMGRID_DEP} -lns3")
-           set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_NS3_3_10")
-           set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_NS3_3_10")
-       else(${NS3_VERSION} EQUAL 310)
-           SET(SIMGRID_DEP "${SIMGRID_DEP} -lns3-core -lns3-csma -lns3-point-to-point -lns3-internet -lns3-applications")
-       endif(${NS3_VERSION} EQUAL 310)
+  if(${NS3_VERSION} EQUAL 310)
+    SET(SIMGRID_DEP "${SIMGRID_DEP} -lns3")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_NS3_3_10")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_NS3_3_10")
+  else(${NS3_VERSION} EQUAL 310)
+    SET(SIMGRID_DEP "${SIMGRID_DEP} -lns3-core -lns3-csma -lns3-point-to-point -lns3-internet -lns3-applications")
+  endif(${NS3_VERSION} EQUAL 310)
 endif(HAVE_NS3)
 
 if(HAVE_POSIX_GETTIME)
-       SET(SIMGRID_DEP "${SIMGRID_DEP} -lrt")
+  SET(SIMGRID_DEP "${SIMGRID_DEP} -lrt")
 endif(HAVE_POSIX_GETTIME)
 
 target_link_libraries(simgrid  ${SIMGRID_DEP})
@@ -134,22 +134,22 @@ target_link_libraries(simgrid     ${SIMGRID_DEP})
 ##################################
 set(SMPI_LDEP "")
 if(APPLE)
-    set(SMPI_LDEP "-Wl,-U -Wl,_smpi_simulated_main")
+  set(SMPI_LDEP "-Wl,-U -Wl,_smpi_simulated_main")
 endif(APPLE)
 if(enable_smpi)
-       target_link_libraries(smpi      simgrid ${SMPI_LDEP})
+  target_link_libraries(smpi   simgrid ${SMPI_LDEP})
 endif(enable_smpi)
 
 # Pass dependencies to static libs
 ##################################
 if(enable_lib_static)
-       target_link_libraries(simgrid_static    ${SIMGRID_DEP})
-       add_dependencies(simgrid_static maintainer_files)
-       set_target_properties(simgrid_static PROPERTIES OUTPUT_NAME simgrid)
-       if(enable_smpi)
-               target_link_libraries(smpi_static       simgrid ${SMPI_LDEP})
-               set_target_properties(smpi_static PROPERTIES OUTPUT_NAME smpi)
-       endif(enable_smpi)
+  target_link_libraries(simgrid_static         ${SIMGRID_DEP})
+  add_dependencies(simgrid_static maintainer_files)
+  set_target_properties(simgrid_static PROPERTIES OUTPUT_NAME simgrid)
+  if(enable_smpi)
+    target_link_libraries(smpi_static  simgrid ${SMPI_LDEP})
+    set_target_properties(smpi_static PROPERTIES OUTPUT_NAME smpi)
+  endif(enable_smpi)
 endif(enable_lib_static)
 
 # Dependencies from maintainer mode
index cd41fa9..69e0227 100644 (file)
@@ -1,44 +1,44 @@
-### Make Libs\r
-#>gcc c:\simgrid-trunk\examples\msg\icomms\peer.c -static -Lc:\simgrid-trunk\lib -lsimgrid -Ic:\simgrid-trunk\include -lwsock32        \r
-add_library(simgrid SHARED ${simgrid_sources})\r
-add_library(gras SHARED ${gras_sources})\r
-\r
-set_target_properties(gras     PROPERTIES COMPILE_FLAGS "-D_XBT_DLL_EXPORT -DDLL_EXPORT" VERSION ${libgras_version}    OUTPUT_NAME "gras")\r
-set_target_properties(simgrid  PROPERTIES COMPILE_FLAGS "-D_XBT_DLL_EXPORT -DDLL_EXPORT" VERSION ${libsimgrid_version} OUTPUT_NAME "simgrid")\r
-\r
-# libpthreadGC2.dll\r
-if(ARCH_32_BITS)\r
-    find_library(PATH_PTHREAD_LIB \r
-       NAMES pthreadGC2.dll\r
-        HINTS\r
-        $ENV{PATH}\r
-        PATH_SUFFIXES bin/ c/bin\r
-        )\r
-else(ARCH_32_BITS)\r
-    find_library(PATH_PTHREAD_LIB \r
-       NAMES pthreadGC2-w64.dll\r
-        HINTS\r
-        $ENV{PATH}\r
-        PATH_SUFFIXES bin/ c/bin\r
-        )\r
-endif(ARCH_32_BITS)\r
-\r
-set(GRAS_DEP "ws2_32 ${PATH_PTHREAD_LIB}")\r
-set(SIMGRID_DEP "ws2_32 ${PATH_PCRE_LIB} ${PATH_PTHREAD_LIB}")\r
-\r
-if(ARCH_32_BITS)\r
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32 -march=i486")\r
-else(ARCH_32_BITS)\r
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64")\r
-#        message(FATAL_ERROR "Sorry, Simgrid fails with full 64bits for now! Please contact us.")
-endif(ARCH_32_BITS)\r
-\r
-target_link_libraries(gras     ${GRAS_DEP})\r
-target_link_libraries(simgrid  ${SIMGRID_DEP})\r
-\r
-find_path(PEXPORTS_PATH NAMES pexports.exe PATHS NO_DEFAULT_PATHS)\r
-message(STATUS "pexports: ${PEXPORTS_PATH}")\r
-if(PEXPORTS_PATH)\r
-add_custom_command(TARGET simgrid POST_BUILD\r
-COMMAND ${PEXPORTS_PATH}/pexports.exe ${CMAKE_BINARY_DIR}/lib/libsimgrid.dll > ${CMAKE_BINARY_DIR}/lib/libsimgrid.def)\r
+### Make Libs
+#>gcc c:\simgrid-trunk\examples\msg\icomms\peer.c -static -Lc:\simgrid-trunk\lib -lsimgrid -Ic:\simgrid-trunk\include -lwsock32
+add_library(simgrid SHARED ${simgrid_sources})
+add_library(gras SHARED ${gras_sources})
+
+set_target_properties(gras     PROPERTIES COMPILE_FLAGS "-D_XBT_DLL_EXPORT -DDLL_EXPORT" VERSION ${libgras_version}    OUTPUT_NAME "gras")
+set_target_properties(simgrid  PROPERTIES COMPILE_FLAGS "-D_XBT_DLL_EXPORT -DDLL_EXPORT" VERSION ${libsimgrid_version} OUTPUT_NAME "simgrid")
+
+# libpthreadGC2.dll
+if(ARCH_32_BITS)
+  find_library(PATH_PTHREAD_LIB
+    NAMES pthreadGC2.dll
+    HINTS
+    $ENV{PATH}
+    PATH_SUFFIXES bin/ c/bin
+    )
+else(ARCH_32_BITS)
+  find_library(PATH_PTHREAD_LIB
+    NAMES pthreadGC2-w64.dll
+    HINTS
+    $ENV{PATH}
+    PATH_SUFFIXES bin/ c/bin
+    )
+endif(ARCH_32_BITS)
+
+set(GRAS_DEP "ws2_32 ${PATH_PTHREAD_LIB}")
+set(SIMGRID_DEP "ws2_32 ${PATH_PCRE_LIB} ${PATH_PTHREAD_LIB}")
+
+if(ARCH_32_BITS)
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32 -march=i486")
+else(ARCH_32_BITS)
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64")
+  #        message(FATAL_ERROR "Sorry, Simgrid fails with full 64bits for now! Please contact us.")
+endif(ARCH_32_BITS)
+
+target_link_libraries(gras     ${GRAS_DEP})
+target_link_libraries(simgrid  ${SIMGRID_DEP})
+
+find_path(PEXPORTS_PATH NAMES pexports.exe PATHS NO_DEFAULT_PATHS)
+message(STATUS "pexports: ${PEXPORTS_PATH}")
+if(PEXPORTS_PATH)
+  add_custom_command(TARGET simgrid POST_BUILD
+    COMMAND ${PEXPORTS_PATH}/pexports.exe ${CMAKE_BINARY_DIR}/lib/libsimgrid.dll > ${CMAKE_BINARY_DIR}/lib/libsimgrid.def)
 endif(PEXPORTS_PATH)
\ No newline at end of file
index 29ad563..7ccb9cd 100644 (file)
@@ -1,59 +1,59 @@
 find_path(HAVE_F2C_H f2c.h
-    HINTS
-    $ENV{LD_LIBRARY_PATH}
-    PATH_SUFFIXES include/
-    PATHS
-    /opt
-    /opt/local
-    /opt/csw
-    /sw
-    /usr
-)
+  HINTS
+  $ENV{LD_LIBRARY_PATH}
+  PATH_SUFFIXES include/
+  PATHS
+  /opt
+  /opt/local
+  /opt/csw
+  /sw
+  /usr
+  )
 
-find_program(F2C_EXE 
-       NAME f2c
-    PATH_SUFFIXES bin/
-    PATHS
-    /opt
-    /opt/local
-    /opt/csw
-    /sw
-    /usr
-)
+find_program(F2C_EXE
+  NAME f2c
+  PATH_SUFFIXES bin/
+  PATHS
+  /opt
+  /opt/local
+  /opt/csw
+  /sw
+  /usr
+  )
 
 find_library(HAVE_F2C_LIB
-    NAME f2c
-    HINTS
-    $ENV{LD_LIBRARY_PATH}
-    PATH_SUFFIXES lib/
-    PATHS
-    /opt
-    /opt/local
-    /opt/csw
-    /sw
-    /usr
-)
+  NAME f2c
+  HINTS
+  $ENV{LD_LIBRARY_PATH}
+  PATH_SUFFIXES lib/
+  PATHS
+  /opt
+  /opt/local
+  /opt/csw
+  /sw
+  /usr
+  )
 
 if(HAVE_F2C_H)
-set(HAVE_SMPI_F2C_H 1)
+  set(HAVE_SMPI_F2C_H 1)
 endif(HAVE_F2C_H)
 
 message(STATUS "Looking for f2c.h")
 if(HAVE_F2C_H)
-message(STATUS "Looking for f2c.h - found")
+  message(STATUS "Looking for f2c.h - found")
 else(HAVE_F2C_H)
-message(STATUS "Looking for f2c.h - not found")
+  message(STATUS "Looking for f2c.h - not found")
 endif(HAVE_F2C_H)
 
 message(STATUS "Looking for lib f2c")
 if(HAVE_F2C_LIB)
-message(STATUS "Looking for lib f2c - found")
+  message(STATUS "Looking for lib f2c - found")
 else(HAVE_F2C_LIB)
-message(STATUS "Looking for lib f2c - not found")
+  message(STATUS "Looking for lib f2c - not found")
 endif(HAVE_F2C_LIB)
 
 if(F2C_EXE)
-message(STATUS "Found F2C: ${F2C_EXE}")
+  message(STATUS "Found F2C: ${F2C_EXE}")
 endif(F2C_EXE)
 
 mark_as_advanced(HAVE_F2C_H)
@@ -63,5 +63,5 @@ mark_as_advanced(HAVE_F2C_LIB)
 if(HAVE_F2C_H)
   include_directories(${HAVE_F2C_H})
 else(HAVE_F2C_H)
-       message(FATAL_ERROR "You should install f2c before use smpi.")
+  message(FATAL_ERROR "You should install f2c before use smpi.")
 endif(HAVE_F2C_H)
\ No newline at end of file
index 338cb57..46e24c2 100644 (file)
@@ -1,56 +1,56 @@
 find_library(HAVE_GTNETS_LIB
-    NAME gtnets
-    PATH_SUFFIXES lib64 lib lib64/gtnets lib/gtnets
-    PATHS
-    ${gtnets_path}
-)
+  NAME gtnets
+  PATH_SUFFIXES lib64 lib lib64/gtnets lib/gtnets
+  PATHS
+  ${gtnets_path}
+  )
 
 find_path(HAVE_SIMULATOR_H
-       NAME simulator.h
-    PATH_SUFFIXES include include/gtnets
-    PATHS
-    ${gtnets_path}
-)
+  NAME simulator.h
+  PATH_SUFFIXES include include/gtnets
+  PATHS
+  ${gtnets_path}
+  )
 
 string(REPLACE "/libgtnets.${LIB_EXE}" ""  GTNETS_LIB_PATH "${HAVE_GTNETS_LIB}")
 
 if(HAVE_GTNETS_LIB AND HAVE_SIMULATOR_H)
 
-       execute_process(COMMAND ${CMAKE_CXX_COMPILER} -I${HAVE_SIMULATOR_H} -lgtnets -L${GTNETS_LIB_PATH} ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_gtnets.cpp
-                                       OUTPUT_VARIABLE COMPILE_GTNETS_VAR)     
-       if(COMPILE_GTNETS_VAR)
-               SET(HAVE_GTNETS 0)
-       else(COMPILE_GTNETS_VAR)
-               SET(HAVE_GTNETS 1)      
-               
-               string(REGEX MATCH "-L${GTNETS_LIB_PATH} " operation "${CMAKE_C_FLAGS}")
-               if(NOT operation)
-                       SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-L${GTNETS_LIB_PATH} ")
-               endif(NOT operation)
-               
-               SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}-I${HAVE_SIMULATOR_H} -L${GTNETS_LIB_PATH} ")
-               
-               string(REGEX MATCH "${GTNETS_LIB_PATH}" operation "$ENV{LD_LIBRARY_PATH}")
-               if(NOT operation)
-                       message(FATAL_ERROR "\n\nTo use GTNETS don't forget to set LD_LIBRARY_PATH with \n\texport LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${GTNETS_LIB_PATH}\n\n")
-               endif(NOT operation)
-               
-       endif(COMPILE_GTNETS_VAR)
+  execute_process(COMMAND ${CMAKE_CXX_COMPILER} -I${HAVE_SIMULATOR_H} -lgtnets -L${GTNETS_LIB_PATH} ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_gtnets.cpp
+    OUTPUT_VARIABLE COMPILE_GTNETS_VAR)
+  if(COMPILE_GTNETS_VAR)
+    SET(HAVE_GTNETS 0)
+  else(COMPILE_GTNETS_VAR)
+    SET(HAVE_GTNETS 1)
+
+    string(REGEX MATCH "-L${GTNETS_LIB_PATH} " operation "${CMAKE_C_FLAGS}")
+    if(NOT operation)
+      SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-L${GTNETS_LIB_PATH} ")
+    endif(NOT operation)
+
+    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}-I${HAVE_SIMULATOR_H} -L${GTNETS_LIB_PATH} ")
+
+    string(REGEX MATCH "${GTNETS_LIB_PATH}" operation "$ENV{LD_LIBRARY_PATH}")
+    if(NOT operation)
+      message(FATAL_ERROR "\n\nTo use GTNETS don't forget to set LD_LIBRARY_PATH with \n\texport LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${GTNETS_LIB_PATH}\n\n")
+    endif(NOT operation)
+
+  endif(COMPILE_GTNETS_VAR)
 
 else(HAVE_GTNETS_LIB AND HAVE_SIMULATOR_H)
-       if(NOT HAVE_GTNETS_LIB)
-       message(STATUS "Gtnets is enabled but can't find it.")
-       endif(NOT HAVE_GTNETS_LIB)
-       if(NOT HAVE_SIMULATOR_H)
-       message(STATUS "Gtnets needs simulator.h")
-       endif(NOT HAVE_SIMULATOR_H)
+  if(NOT HAVE_GTNETS_LIB)
+    message(STATUS "Gtnets is enabled but can't find it.")
+  endif(NOT HAVE_GTNETS_LIB)
+  if(NOT HAVE_SIMULATOR_H)
+    message(STATUS "Gtnets needs simulator.h")
+  endif(NOT HAVE_SIMULATOR_H)
 endif(HAVE_GTNETS_LIB AND HAVE_SIMULATOR_H)
 
 message(STATUS "Looking for lib gtnets patch")
 if(HAVE_GTNETS)
-message(STATUS "Looking for lib gtnets patch - found")
+  message(STATUS "Looking for lib gtnets patch - found")
 else(HAVE_GTNETS)
-message(STATUS "Looking for lib gtnets patch - not found")
+  message(STATUS "Looking for lib gtnets patch - not found")
 endif(HAVE_GTNETS)
 
 mark_as_advanced(HAVE_GTNETS_LIB)
index f982b33..cf16bff 100644 (file)
@@ -1,94 +1,94 @@
 find_path(HAVE_CGRAPH_H cgraph.h
-    HINTS
-    $ENV{LD_LIBRARY_PATH}
-    PATH_SUFFIXES include/graphviz include
-    PATHS
-    /opt
-    /opt/local
-    /opt/csw
-    /sw
-    /usr
-)
+  HINTS
+  $ENV{LD_LIBRARY_PATH}
+  PATH_SUFFIXES include/graphviz include
+  PATHS
+  /opt
+  /opt/local
+  /opt/csw
+  /sw
+  /usr
+  )
 
 find_path(HAVE_AGRAPH_H agraph.h
-    HINTS
-    $ENV{LD_LIBRARY_PATH}
-    PATH_SUFFIXES include/graphviz include
-    PATHS
-    /opt
-    /opt/local
-    /opt/csw
-    /sw
-    /usr
-)
+  HINTS
+  $ENV{LD_LIBRARY_PATH}
+  PATH_SUFFIXES include/graphviz include
+  PATHS
+  /opt
+  /opt/local
+  /opt/csw
+  /sw
+  /usr
+  )
 
 find_path(HAVE_GRAPH_H graph.h
-    HINTS
-    $ENV{LD_LIBRARY_PATH}
-    PATH_SUFFIXES include/graphviz include
-    PATHS
-    /opt
-    /opt/local
-    /opt/csw
-    /sw
-    /usr
-)
+  HINTS
+  $ENV{LD_LIBRARY_PATH}
+  PATH_SUFFIXES include/graphviz include
+  PATHS
+  /opt
+  /opt/local
+  /opt/csw
+  /sw
+  /usr
+  )
 
 find_library(HAVE_CGRAPH_LIB
-    NAME cgraph
-    HINTS
-    $ENV{LD_LIBRARY_PATH}
-    PATH_SUFFIXES lib/graphviz lib
-    PATHS
-    /opt
-    /opt/local
-    /opt/csw
-    /sw
-    /usr
-)  
+  NAME cgraph
+  HINTS
+  $ENV{LD_LIBRARY_PATH}
+  PATH_SUFFIXES lib/graphviz lib
+  PATHS
+  /opt
+  /opt/local
+  /opt/csw
+  /sw
+  /usr
+  )
 
 find_library(HAVE_AGRAPH_LIB
-    NAME agraph
-    HINTS
-    $ENV{LD_LIBRARY_PATH}
-    PATH_SUFFIXES lib/graphviz lib
-    PATHS
-    /opt
-    /opt/local
-    /opt/csw
-    /sw
-    /usr
-) 
+  NAME agraph
+  HINTS
+  $ENV{LD_LIBRARY_PATH}
+  PATH_SUFFIXES lib/graphviz lib
+  PATHS
+  /opt
+  /opt/local
+  /opt/csw
+  /sw
+  /usr
+  )
 
 find_library(HAVE_GRAPH_LIB
-    NAME graph
-    HINTS
-    $ENV{LD_LIBRARY_PATH}
-    PATH_SUFFIXES lib/graphviz lib
-    PATHS
-    /opt
-    /opt/local
-    /opt/csw
-    /sw
-    /usr
-)
+  NAME graph
+  HINTS
+  $ENV{LD_LIBRARY_PATH}
+  PATH_SUFFIXES lib/graphviz lib
+  PATHS
+  /opt
+  /opt/local
+  /opt/csw
+  /sw
+  /usr
+  )
 
 find_library(HAVE_CDT_LIB
-    NAME cdt
-    HINTS
-    $ENV{LD_LIBRARY_PATH}
-    PATH_SUFFIXES lib/graphviz lib
-    PATHS
-    /opt
-    /opt/local
-    /opt/csw
-    /sw
-    /usr
-)
+  NAME cdt
+  HINTS
+  $ENV{LD_LIBRARY_PATH}
+  PATH_SUFFIXES lib/graphviz lib
+  PATHS
+  /opt
+  /opt/local
+  /opt/csw
+  /sw
+  /usr
+  )
 
 mark_as_advanced(HAVE_AGRAPH_H)
-mark_as_advanced(HAVE_CGRAPH_H)                                                                                
-mark_as_advanced(HAVE_GRAPH_H)                                                                                  
+mark_as_advanced(HAVE_CGRAPH_H)
+mark_as_advanced(HAVE_GRAPH_H)
 mark_as_advanced(HAVE_GRAPH_LIB)
 mark_as_advanced(HAVE_CGRAPH_LIB)
 mark_as_advanced(HAVE_AGRAPH_LIB)
@@ -96,47 +96,47 @@ mark_as_advanced(HAVE_CDT_LIB)
 
 ### Initialize of cgraph
 if(HAVE_CDT_LIB)
-if(HAVE_CGRAPH_LIB OR HAVE_AGRAPH_LIB)
+  if(HAVE_CGRAPH_LIB OR HAVE_AGRAPH_LIB)
 
     if(HAVE_AGRAPH_LIB)
-       string(REGEX REPLACE "/libagraph.*" "" lib_graphviz ${HAVE_AGRAPH_LIB})   
+      string(REGEX REPLACE "/libagraph.*" "" lib_graphviz ${HAVE_AGRAPH_LIB})
     else(HAVE_AGRAPH_LIB)
-        if(HAVE_CGRAPH_LIB)
-           string(REGEX REPLACE "/libcgraph.*" "" lib_graphviz ${HAVE_CGRAPH_LIB})   
-        endif(HAVE_CGRAPH_LIB)
+      if(HAVE_CGRAPH_LIB)
+       string(REGEX REPLACE "/libcgraph.*" "" lib_graphviz ${HAVE_CGRAPH_LIB})
+      endif(HAVE_CGRAPH_LIB)
     endif(HAVE_AGRAPH_LIB)
-      
+
     if(HAVE_GRAPH_H OR HAVE_AGRAPH_H OR HAVE_CGRAPH_H)
-    
-        if(HAVE_GRAPH_H)
-               string(REPLACE "/graphviz/graph.h" "" file_graphviz_h ${HAVE_GRAPH_H})
-               string(REPLACE "/graphviz" "" file_graphviz_h ${file_graphviz_h})
-               set(GRAPH_H 1)
-        endif(HAVE_GRAPH_H)
-        
-        if(HAVE_AGRAPH_H)
-               string(REPLACE "/graphviz/agraph.h" "" file_graphviz_h ${HAVE_AGRAPH_H})
-               string(REPLACE "/graphviz" "" file_graphviz_h ${file_graphviz_h})
-               set(AGRAPH_H 1)
-        endif(HAVE_AGRAPH_H)
-        
-        if(HAVE_CGRAPH_H)
-               string(REPLACE "/graphviz/cgraph.h" "" file_graphviz_h ${HAVE_CGRAPH_H})
-               string(REPLACE "/graphviz" "" file_graphviz_h ${file_graphviz_h})
-               set(CGRAPH_H 1)
-        endif(HAVE_CGRAPH_H)  
-         
-        include_directories(${file_graphviz_h} ${file_graphviz_h}/graphviz)
-        link_directories(${lib_graphviz})
-       
-       set(HAVE_GRAPHVIZ "1")
+
+      if(HAVE_GRAPH_H)
+       string(REPLACE "/graphviz/graph.h" "" file_graphviz_h ${HAVE_GRAPH_H})
+       string(REPLACE "/graphviz" "" file_graphviz_h ${file_graphviz_h})
+       set(GRAPH_H 1)
+      endif(HAVE_GRAPH_H)
+
+      if(HAVE_AGRAPH_H)
+       string(REPLACE "/graphviz/agraph.h" "" file_graphviz_h ${HAVE_AGRAPH_H})
+       string(REPLACE "/graphviz" "" file_graphviz_h ${file_graphviz_h})
+       set(AGRAPH_H 1)
+      endif(HAVE_AGRAPH_H)
+
+      if(HAVE_CGRAPH_H)
+       string(REPLACE "/graphviz/cgraph.h" "" file_graphviz_h ${HAVE_CGRAPH_H})
+       string(REPLACE "/graphviz" "" file_graphviz_h ${file_graphviz_h})
+       set(CGRAPH_H 1)
+      endif(HAVE_CGRAPH_H)
+
+      include_directories(${file_graphviz_h} ${file_graphviz_h}/graphviz)
+      link_directories(${lib_graphviz})
+
+      set(HAVE_GRAPHVIZ "1")
     else(HAVE_GRAPH_H OR HAVE_AGRAPH_H OR HAVE_CGRAPH_H)
-        set(HAVE_GRAPHVIZ "0")
+      set(HAVE_GRAPHVIZ "0")
     endif(HAVE_GRAPH_H OR HAVE_AGRAPH_H OR HAVE_CGRAPH_H)
-    
-else(HAVE_CGRAPH_LIB OR HAVE_AGRAPH_LIB)
-        set(HAVE_GRAPHVIZ "0")
-endif(HAVE_CGRAPH_LIB OR HAVE_AGRAPH_LIB)
+
+  else(HAVE_CGRAPH_LIB OR HAVE_AGRAPH_LIB)
+    set(HAVE_GRAPHVIZ "0")
+  endif(HAVE_CGRAPH_LIB OR HAVE_AGRAPH_LIB)
 
 endif(HAVE_CDT_LIB)
 
@@ -144,49 +144,49 @@ mark_as_advanced(HAVE_GRAPHVIZ)
 
 message(STATUS "Looking for agraph.h")
 if(HAVE_AGRAPH_H)
-message(STATUS "Looking for agraph.h - found")
+  message(STATUS "Looking for agraph.h - found")
 else(HAVE_AGRAPH_H)
-message(STATUS "Looking for agraph.h - not found")
+  message(STATUS "Looking for agraph.h - not found")
 endif(HAVE_AGRAPH_H)
 
 message(STATUS "Looking for cgraph.h")
 if(HAVE_CGRAPH_H)
-message(STATUS "Looking for cgraph.h - found")
+  message(STATUS "Looking for cgraph.h - found")
 else(HAVE_CGRAPH_H)
-message(STATUS "Looking for cgraph.h - not found")
+  message(STATUS "Looking for cgraph.h - not found")
 endif(HAVE_CGRAPH_H)
 
 message(STATUS "Looking for graph.h")
 if(HAVE_GRAPH_H)
-message(STATUS "Looking for graph.h - found")
+  message(STATUS "Looking for graph.h - found")
 else(HAVE_GRAPH_H)
-message(STATUS "Looking for graph.h - not found")
+  message(STATUS "Looking for graph.h - not found")
 endif(HAVE_GRAPH_H)
 
 message(STATUS "Looking for lib agraph")
 if(HAVE_AGRAPH_LIB)
-message(STATUS "Looking for lib agraph - found")
+  message(STATUS "Looking for lib agraph - found")
 else(HAVE_AGRAPH_LIB)
-message(STATUS "Looking for lib agraph - not found")
+  message(STATUS "Looking for lib agraph - not found")
 endif(HAVE_AGRAPH_LIB)
 
 message(STATUS "Looking for lib cgraph")
 if(HAVE_CGRAPH_LIB)
-message(STATUS "Looking for lib cgraph - found")
+  message(STATUS "Looking for lib cgraph - found")
 else(HAVE_CGRAPH_LIB)
-message(STATUS "Looking for lib cgraph - not found")
+  message(STATUS "Looking for lib cgraph - not found")
 endif(HAVE_CGRAPH_LIB)
 
 message(STATUS "Looking for lib graph")
 if(HAVE_GRAPH_LIB)
-message(STATUS "Looking for lib graph - found")
+  message(STATUS "Looking for lib graph - found")
 else(HAVE_GRAPH_LIB)
-message(STATUS "Looking for lib graph - not found")
+  message(STATUS "Looking for lib graph - not found")
 endif(HAVE_GRAPH_LIB)
 
 message(STATUS "Looking for lib cdt")
 if(HAVE_CDT_LIB)
-message(STATUS "Looking for lib cdt - found")
+  message(STATUS "Looking for lib cdt - found")
 else(HAVE_CDT_LIB)
-message(STATUS "Looking for lib cdt - not found")
+  message(STATUS "Looking for lib cdt - not found")
 endif(HAVE_CDT_LIB)
\ No newline at end of file
index eb95ff4..9f5ced9 100644 (file)
@@ -3,35 +3,35 @@ find_program(HAVE_LUA_BIN NAMES lua)
 
 message(STATUS "Looking for lua.h")
 if(LUA_INCLUDE_DIR)
-message(STATUS "Looking for lua.h - found")
+  message(STATUS "Looking for lua.h - found")
 else(LUA_INCLUDE_DIR)
-message(STATUS "Looking for lua.h - not found")
+  message(STATUS "Looking for lua.h - not found")
 endif(LUA_INCLUDE_DIR)
 
 if(HAVE_LUA_BIN)
-message(STATUS "Found Lua: ${HAVE_LUA_BIN}")
+  message(STATUS "Found Lua: ${HAVE_LUA_BIN}")
 endif(HAVE_LUA_BIN)
 
 set(LIB_LUA_NAME "")
 
 foreach(lib_path ${LUA_LIBRARIES})
   if(NOT LIB_LUA_NAME)
-  string(REGEX MATCH "liblua.*$" LIB_LUA_NAME "${lib_path}")
-  string(REPLACE ".${LIB_EXE}" "" LIB_LUA_NAME "${LIB_LUA_NAME}")
-  string(REPLACE "lib" "" LIB_LUA_NAME "${LIB_LUA_NAME}")
-  if(LIB_LUA_NAME)
-    string(REPLACE "/lib${LIB_LUA_NAME}.${LIB_EXE}" "" LUA_LIBRARY_DIR ${lib_path})
-  endif(LIB_LUA_NAME)
+    string(REGEX MATCH "liblua.*$" LIB_LUA_NAME "${lib_path}")
+    string(REPLACE ".${LIB_EXE}" "" LIB_LUA_NAME "${LIB_LUA_NAME}")
+    string(REPLACE "lib" "" LIB_LUA_NAME "${LIB_LUA_NAME}")
+    if(LIB_LUA_NAME)
+      string(REPLACE "/lib${LIB_LUA_NAME}.${LIB_EXE}" "" LUA_LIBRARY_DIR ${lib_path})
+    endif(LIB_LUA_NAME)
   endif(NOT LIB_LUA_NAME)
 endforeach(lib_path ${LUA_LIBRARIES})
 
 message(STATUS "Looking for lib lua")
 if(LUA_LIBRARY_DIR)
-message(STATUS "Looking for lib lua - found")
-message(STATUS "Lua version: ${LIB_LUA_NAME}")
-message(STATUS "Lib path   : ${LUA_LIBRARY_DIR}")
+  message(STATUS "Looking for lib lua - found")
+  message(STATUS "Lua version: ${LIB_LUA_NAME}")
+  message(STATUS "Lib path   : ${LUA_LIBRARY_DIR}")
 else(LUA_LIBRARY_DIR)
-message(STATUS "Looking for lib lua - not found")
+  message(STATUS "Looking for lib lua - not found")
 endif(LUA_LIBRARY_DIR)
 
 if(LUA51_FOUND)
@@ -39,5 +39,5 @@ if(LUA51_FOUND)
   include_directories(${LUA_INCLUDE_DIR})
   link_directories(${LUA_LIBRARY_DIR})
 else(LUA51_FOUND)
-       message(STATUS "Warning : Lua need version 5.1")
+  message(STATUS "Warning : Lua need version 5.1")
 endif(LUA51_FOUND)
index 5f7ca63..d9a2687 100644 (file)
@@ -6,89 +6,89 @@
 # ln -sf libns3.14.1-core-debug.so libns3-core.so
 
 find_library(HAVE_NS3_LIB
-    NAME ns3
-    PATH_SUFFIXES lib64 lib ns3/lib
-    PATHS
-    ${ns3_path}
-)
+  NAME ns3
+  PATH_SUFFIXES lib64 lib ns3/lib
+  PATHS
+  ${ns3_path}
+  )
 
 find_library(HAVE_NS3_CORE_LIB
-    NAME ns3-core
-    PATH_SUFFIXES lib64 lib ns3/lib
-    PATHS
-    ${ns3_path}
-)
+  NAME ns3-core
+  PATH_SUFFIXES lib64 lib ns3/lib
+  PATHS
+  ${ns3_path}
+  )
 
 find_path(HAVE_CORE_MODULE_H
-       NAME ns3/core-module.h
-    PATH_SUFFIXES include ns3/include include/ns3.14.1
-    PATHS
-    ${ns3_path}
-)
+  NAME ns3/core-module.h
+  PATH_SUFFIXES include ns3/include include/ns3.14.1
+  PATHS
+  ${ns3_path}
+  )
 
 message(STATUS "Looking for core-module.h")
 if(HAVE_CORE_MODULE_H)
-message(STATUS "Looking for core-module.h - found")
+  message(STATUS "Looking for core-module.h - found")
 else(HAVE_CORE_MODULE_H)
-message(STATUS "Looking for core-module.h - not found")
+  message(STATUS "Looking for core-module.h - not found")
 endif(HAVE_CORE_MODULE_H)
 mark_as_advanced(HAVE_CORE_MODULE_H)
 
 message(STATUS "Looking for lib ns3")
 if(HAVE_NS3_LIB)
-message(STATUS "Looking for lib ns3 - found")
+  message(STATUS "Looking for lib ns3 - found")
 else(HAVE_NS3_LIB)
-message(STATUS "Looking for lib ns3 - not found")
+  message(STATUS "Looking for lib ns3 - not found")
 endif(HAVE_NS3_LIB)
 mark_as_advanced(HAVE_NS3_LIB)
 
 message(STATUS "Looking for lib ns3-core")
 if(HAVE_NS3_CORE_LIB)
-message(STATUS "Looking for lib ns3-core - found")
+  message(STATUS "Looking for lib ns3-core - found")
 else(HAVE_NS3_CORE_LIB)
-message(STATUS "Looking for lib ns3-core - not found")
+  message(STATUS "Looking for lib ns3-core - not found")
 endif(HAVE_NS3_CORE_LIB)
 
 mark_as_advanced(HAVE_NS3_LIB)
 mark_as_advanced(HAVE_NS3_CORE_LIB)
 
 if(HAVE_CORE_MODULE_H)
-    if(HAVE_NS3_LIB)
-        message(STATUS "Warning: NS-3 version <= 3.10")
-        set(HAVE_NS3 1)
-        set(NS3_VERSION 310)
-        string(REPLACE "/libns3.${LIB_EXE}" ""  HAVE_NS3_LIB "${HAVE_NS3_LIB}")
-    endif(HAVE_NS3_LIB)
-    if(HAVE_NS3_CORE_LIB)
-        message(STATUS "NS-3 version > 3.10")
-        set(HAVE_NS3 1)
-        set(NS3_VERSION 312)
-        string(REPLACE "/libns3-core.${LIB_EXE}" ""  HAVE_NS3_LIB "${HAVE_NS3_CORE_LIB}")
-    endif(HAVE_NS3_CORE_LIB)
+  if(HAVE_NS3_LIB)
+    message(STATUS "Warning: NS-3 version <= 3.10")
+    set(HAVE_NS3 1)
+    set(NS3_VERSION 310)
+    string(REPLACE "/libns3.${LIB_EXE}" ""  HAVE_NS3_LIB "${HAVE_NS3_LIB}")
+  endif(HAVE_NS3_LIB)
+  if(HAVE_NS3_CORE_LIB)
+    message(STATUS "NS-3 version > 3.10")
+    set(HAVE_NS3 1)
+    set(NS3_VERSION 312)
+    string(REPLACE "/libns3-core.${LIB_EXE}" ""  HAVE_NS3_LIB "${HAVE_NS3_CORE_LIB}")
+  endif(HAVE_NS3_CORE_LIB)
 endif(HAVE_CORE_MODULE_H)
 
 if(HAVE_NS3)
-       string(REGEX MATCH "${HAVE_NS3_LIB}" operation "$ENV{LD_LIBRARY_PATH}")
-       if(NOT operation)
-               message(STATUS "Warning: To use NS-3 don't forget to set LD_LIBRARY_PATH with:  export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${HAVE_NS3_LIB}")
-       else(NOT operation)
-       
-               string(REGEX MATCH "-L${HAVE_NS3_LIB} " operation1 "${CMAKE_C_FLAGS}")
-               if(NOT operation1)
-                       SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-L${HAVE_NS3_LIB} ")
-               endif(NOT operation1)
-               
-               string(REGEX MATCH "-I${HAVE_CORE_MODULE_H} " operation1 "${CMAKE_C_FLAGS}")
-               if(NOT operation1)
-                       SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${HAVE_CORE_MODULE_H} ")
-               endif(NOT operation1)
-       
-               SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}-I${HAVE_CORE_MODULE_H} -L${HAVE_NS3_LIB} ")
-       endif(NOT operation)            
+  string(REGEX MATCH "${HAVE_NS3_LIB}" operation "$ENV{LD_LIBRARY_PATH}")
+  if(NOT operation)
+    message(STATUS "Warning: To use NS-3 don't forget to set LD_LIBRARY_PATH with:     export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${HAVE_NS3_LIB}")
+  else(NOT operation)
+
+    string(REGEX MATCH "-L${HAVE_NS3_LIB} " operation1 "${CMAKE_C_FLAGS}")
+    if(NOT operation1)
+      SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-L${HAVE_NS3_LIB} ")
+    endif(NOT operation1)
+
+    string(REGEX MATCH "-I${HAVE_CORE_MODULE_H} " operation1 "${CMAKE_C_FLAGS}")
+    if(NOT operation1)
+      SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${HAVE_CORE_MODULE_H} ")
+    endif(NOT operation1)
+
+    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}-I${HAVE_CORE_MODULE_H} -L${HAVE_NS3_LIB} ")
+  endif(NOT operation)
 else(HAVE_NS3)
-        message(STATUS "Warning: To use NS-3 Please install ns3 at least version 3.10 (http://www.nsnam.org/releases/)")
+  message(STATUS "Warning: To use NS-3 Please install ns3 at least version 3.10 (http://www.nsnam.org/releases/)")
 endif(HAVE_NS3)
 
 if(HAVE_NS3 AND enable_supernovae)
-    set(enable_supernovae OFF)
+  set(enable_supernovae OFF)
 endif(HAVE_NS3 AND enable_supernovae)
index 95fe8a8..f4b57b7 100644 (file)
@@ -1,42 +1,42 @@
-find_library(PATH_PCRE_LIB 
-       NAMES pcre
-    HINTS
-    $ENV{SIMGRID_PCRE_LIBRARY_PATH}
-    $ENV{LD_LIBRARY_PATH}
-    $ENV{PCRE_LIBRARY_PATH}
-    PATH_SUFFIXES lib/ GnuWin32/lib
-    PATHS
-    /opt
-    /opt/local
-    /opt/csw
-    /sw
-    /usr)  
+find_library(PATH_PCRE_LIB
+  NAMES pcre
+  HINTS
+  $ENV{SIMGRID_PCRE_LIBRARY_PATH}
+  $ENV{LD_LIBRARY_PATH}
+  $ENV{PCRE_LIBRARY_PATH}
+  PATH_SUFFIXES lib/ GnuWin32/lib
+  PATHS
+  /opt
+  /opt/local
+  /opt/csw
+  /sw
+  /usr)
 
 find_path(PATH_PCRE_H "pcre.h"
-    HINTS
-    $ENV{SIMGRID_PCRE_LIBRARY_PATH}
-    $ENV{LD_LIBRARY_PATH}
-    $ENV{PCRE_LIBRARY_PATH}
-    PATH_SUFFIXES include/ GnuWin32/include
-    PATHS
-    /opt
-    /opt/local
-    /opt/csw
-    /sw
-    /usr)
+  HINTS
+  $ENV{SIMGRID_PCRE_LIBRARY_PATH}
+  $ENV{LD_LIBRARY_PATH}
+  $ENV{PCRE_LIBRARY_PATH}
+  PATH_SUFFIXES include/ GnuWin32/include
+  PATHS
+  /opt
+  /opt/local
+  /opt/csw
+  /sw
+  /usr)
 
 message(STATUS "Looking for pcre.h")
 if(PATH_PCRE_H)
-message(STATUS "Looking for pcre.h - found")
+  message(STATUS "Looking for pcre.h - found")
 else(PATH_PCRE_H)
-message(STATUS "Looking for pcre.h - not found")
+  message(STATUS "Looking for pcre.h - not found")
 endif(PATH_PCRE_H)
 
 message(STATUS "Looking for lib pcre")
 if(PATH_PCRE_LIB)
-message(STATUS "Looking for lib pcre - found")
+  message(STATUS "Looking for lib pcre - found")
 else(PATH_PCRE_LIB)
-message(STATUS "Looking for lib pcre - not found")
+  message(STATUS "Looking for lib pcre - not found")
 endif(PATH_PCRE_LIB)
 
 if(PATH_PCRE_LIB AND PATH_PCRE_H)
@@ -45,7 +45,7 @@ if(PATH_PCRE_LIB AND PATH_PCRE_H)
   include_directories(${PATH_PCRE_H})
   link_directories(${PATH_PCRE_LIB})
 else(PATH_PCRE_LIB)
-          message(FATAL_ERROR "Please install the libpcre3-dev package or equivalent before using SimGrid.")
+  message(FATAL_ERROR "Please install the libpcre3-dev package or equivalent before using SimGrid.")
 endif(PATH_PCRE_LIB AND PATH_PCRE_H)
 
 set(PCRE_LIBRARY_PATH $ENV{PCRE_LIBRARY_PATH})
index c22412c..021867d 100644 (file)
@@ -1,41 +1,41 @@
 # LIB libpcre.dll
-find_library(PATH_PCRE_LIB 
-       NAMES pcre
-    HINTS
-    $ENV{SIMGRID_PCRE_LIBRARY_PATH}
-    $ENV{PCRE_LIBRARY_PATH}
-    PATH_SUFFIXES bin/ GnuWin32/bin
-    )
+find_library(PATH_PCRE_LIB
+  NAMES pcre
+  HINTS
+  $ENV{SIMGRID_PCRE_LIBRARY_PATH}
+  $ENV{PCRE_LIBRARY_PATH}
+  PATH_SUFFIXES bin/ GnuWin32/bin
+  )
 
 find_path(PATH_PCRE_H "pcre.h"
-    HINTS
-    $ENV{SIMGRID_PCRE_LIBRARY_PATH}
-    $ENV{PCRE_LIBRARY_PATH}
-    PATH_SUFFIXES include/ GnuWin32/include
-    )
-    
+  HINTS
+  $ENV{SIMGRID_PCRE_LIBRARY_PATH}
+  $ENV{PCRE_LIBRARY_PATH}
+  PATH_SUFFIXES include/ GnuWin32/include
+  )
+
 message(STATUS "Looking for pcre.h")
 if(PATH_PCRE_H)
-message(STATUS "Looking for pcre.h - found")
+  message(STATUS "Looking for pcre.h - found")
 else(PATH_PCRE_H)
-message(STATUS "Looking for pcre.h - not found")
+  message(STATUS "Looking for pcre.h - not found")
 endif(PATH_PCRE_H)
 
 message(STATUS "Looking for lib pcre")
 if(PATH_PCRE_LIB)
-message(STATUS "Looking for lib pcre - found")
+  message(STATUS "Looking for lib pcre - found")
 else(PATH_PCRE_LIB)
-message(STATUS "Looking for lib pcre - not found")
+  message(STATUS "Looking for lib pcre - not found")
 endif(PATH_PCRE_LIB)
 
 if(PATH_PCRE_LIB AND PATH_PCRE_H)
-       string(REGEX REPLACE "/pcre.h" "" PATH_PCRE_H "${PATH_PCRE_H}")
-          string(REGEX MATCH "-I${PATH_PCRE_H} " operation "${CMAKE_C_FLAGS}")
-          if(NOT operation)
-                       SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${PATH_PCRE_H} ")
-          endif(NOT operation)    
+  string(REGEX REPLACE "/pcre.h" "" PATH_PCRE_H "${PATH_PCRE_H}")
+  string(REGEX MATCH "-I${PATH_PCRE_H} " operation "${CMAKE_C_FLAGS}")
+  if(NOT operation)
+    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${PATH_PCRE_H} ")
+  endif(NOT operation)
 else(PATH_PCRE_LIB)
-          message(FATAL_ERROR "Please install the pcre package before using SimGrid.")
+  message(FATAL_ERROR "Please install the pcre package before using SimGrid.")
 endif(PATH_PCRE_LIB AND PATH_PCRE_H)
 
 set(PCRE_LIBRARY_PATH $ENV{PCRE_LIBRARY_PATH})
index cc2ef67..c057c27 100644 (file)
@@ -1,50 +1,50 @@
 find_path(HAVE_RNGSTREAM_H
-       NAME RngStream.h
-    HINTS
-    $ENV{HOME}
-    PATH_SUFFIXES include
-    PATHS
-    /opt
-    /opt/local
-    /opt/csw
-    /sw
-    /usr
-)
+  NAME RngStream.h
+  HINTS
+  $ENV{HOME}
+  PATH_SUFFIXES include
+  PATHS
+  /opt
+  /opt/local
+  /opt/csw
+  /sw
+  /usr
+  )
 
 find_library(HAVE_RNGSTREAM_LIB
-    NAME rngstreams
-    HINTS
-    $ENV{HOME}
-    PATH_SUFFIXES lib64 lib lib32
-    PATHS
-    /opt
-    /opt/local
-    /opt/csw
-    /sw
-    /usr
-)
+  NAME rngstreams
+  HINTS
+  $ENV{HOME}
+  PATH_SUFFIXES lib64 lib lib32
+  PATHS
+  /opt
+  /opt/local
+  /opt/csw
+  /sw
+  /usr
+  )
 
 message(STATUS "Looking for RngStream.h")
 if(HAVE_RNGSTREAM_H)
-       message(STATUS "Looking for RngStream.h - found")
-       string(REGEX MATCH "-I${HAVE_RNGSTREAM_H} " operation "${CMAKE_C_FLAGS}")
-       if(NOT operation)
-       SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${HAVE_RNGSTREAM_H} ")
-       endif(NOT operation)
+  message(STATUS "Looking for RngStream.h - found")
+  string(REGEX MATCH "-I${HAVE_RNGSTREAM_H} " operation "${CMAKE_C_FLAGS}")
+  if(NOT operation)
+    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${HAVE_RNGSTREAM_H} ")
+  endif(NOT operation)
 else(HAVE_RNGSTREAM_H)
-       message(STATUS "Looking for RngStream.h - not found")
+  message(STATUS "Looking for RngStream.h - not found")
 endif(HAVE_RNGSTREAM_H)
 
 message(STATUS "Looking for lib rngstreams")
 if(HAVE_RNGSTREAM_LIB)
-message(STATUS "Looking for lib rngstreams - found")
-       string(REGEX REPLACE "/librngstreams.*" "" HAVE_RNGSTREAM_LIB "${HAVE_RNGSTREAM_LIB}")
-       string(REGEX MATCH "-L${HAVE_RNGSTREAM_LIB} " operation "${CMAKE_C_FLAGS}")
-       if(NOT operation)
-       SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-L${HAVE_RNGSTREAM_LIB} ")
-       endif(NOT operation)
+  message(STATUS "Looking for lib rngstreams - found")
+  string(REGEX REPLACE "/librngstreams.*" "" HAVE_RNGSTREAM_LIB "${HAVE_RNGSTREAM_LIB}")
+  string(REGEX MATCH "-L${HAVE_RNGSTREAM_LIB} " operation "${CMAKE_C_FLAGS}")
+  if(NOT operation)
+    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-L${HAVE_RNGSTREAM_LIB} ")
+  endif(NOT operation)
 else(HAVE_RNGSTREAM_LIB)
-       message(STATUS "Looking for lib rngstreams - not found")
+  message(STATUS "Looking for lib rngstreams - not found")
 endif(HAVE_RNGSTREAM_LIB)
 
 mark_as_advanced(HAVE_RNGSTREAM_LIB)
index 65a728a..742cda2 100644 (file)
@@ -1,54 +1,54 @@
 include(FindRuby)
 
 if(RUBY_EXECUTABLE)
-       message(STATUS "Found ruby:     ${RUBY_EXECUTABLE}")
+  message(STATUS "Found ruby:  ${RUBY_EXECUTABLE}")
 endif(RUBY_EXECUTABLE)
 
 message(STATUS "Looking for ruby.h")
 if(RUBY_INCLUDE_DIR)
-message(STATUS "Looking for ruby.h - found")
+  message(STATUS "Looking for ruby.h - found")
 else(RUBY_INCLUDE_DIR)
-message(STATUS "Looking for ruby.h - not found")
+  message(STATUS "Looking for ruby.h - not found")
 endif(RUBY_INCLUDE_DIR)
 
 message(STATUS "Looking for confi.h")
 if(RUBY_CONFIG_INCLUDE_DIR)
-message(STATUS "Looking for config.h - found")
+  message(STATUS "Looking for config.h - found")
 else(RUBY_CONFIG_INCLUDE_DIR)
-message(STATUS "Looking for config.h - not found")
+  message(STATUS "Looking for config.h - not found")
 endif(RUBY_CONFIG_INCLUDE_DIR)
 
 message(STATUS "Looking for lib ruby")
 if(RUBY_LIBRARY)
-message(STATUS "Looking for lib ruby - found")
+  message(STATUS "Looking for lib ruby - found")
 else(RUBY_LIBRARY)
-message(STATUS "Looking for lib ruby - not found")
+  message(STATUS "Looking for lib ruby - not found")
 endif(RUBY_LIBRARY)
 
 if(RUBY_LIBRARY)
-       set(LIB_RUBY_VERSION "${RUBY_VERSION_MAJOR}.${RUBY_VERSION_MINOR}.${RUBY_VERSION_PATCH}")
-       message(STATUS "Lib ruby version: ${LIB_RUBY_VERSION}")
-       if(RUBY_VERSION_MAJOR MATCHES "1" AND RUBY_VERSION_MINOR MATCHES "9")
-               string(REGEX MATCH "ruby.*[0-9]" RUBY_LIBRARY_NAME ${RUBY_LIBRARY})
-               if(NOT RUBY_LIBRARY_NAME)
-                       set(RUBY_LIBRARY_NAME ruby)
-               endif(NOT RUBY_LIBRARY_NAME)
-               string(REGEX REPLACE "/libruby.*$" "" RUBY_LIBRARY ${RUBY_LIBRARY})
-               SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${RUBY_CONFIG_INCLUDE_DIR} ") #path to config.h
-               string(COMPARE EQUAL "${RUBY_INCLUDE_DIR}" "${RUBY_CONFIG_INCLUDE_DIR}" operation)
-               if(NOT operation)
-                       SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${RUBY_INCLUDE_DIR} ") #path to ruby.h
-               endif(NOT operation)
-               ADD_DEFINITIONS("-I${CMAKE_HOME_DIRECTORY}/src/bindings/ruby -I${CMAKE_HOME_DIRECTORY}/src/simix")
-               SET(HAVE_RUBY 1)
-       else(RUBY_VERSION_MAJOR MATCHES "1" AND RUBY_VERSION_MINOR MATCHES "9")
-               message(STATUS "Warning: Ruby bindings need version 1.9.x, but found version ${RUBY_VERSION_MAJOR}.${RUBY_VERSION_MINOR}.x")
-               SET(HAVE_RUBY 0)
-       endif(RUBY_VERSION_MAJOR MATCHES "1" AND RUBY_VERSION_MINOR MATCHES "9")
+  set(LIB_RUBY_VERSION "${RUBY_VERSION_MAJOR}.${RUBY_VERSION_MINOR}.${RUBY_VERSION_PATCH}")
+  message(STATUS "Lib ruby version: ${LIB_RUBY_VERSION}")
+  if(RUBY_VERSION_MAJOR MATCHES "1" AND RUBY_VERSION_MINOR MATCHES "9")
+    string(REGEX MATCH "ruby.*[0-9]" RUBY_LIBRARY_NAME ${RUBY_LIBRARY})
+    if(NOT RUBY_LIBRARY_NAME)
+      set(RUBY_LIBRARY_NAME ruby)
+    endif(NOT RUBY_LIBRARY_NAME)
+    string(REGEX REPLACE "/libruby.*$" "" RUBY_LIBRARY ${RUBY_LIBRARY})
+    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${RUBY_CONFIG_INCLUDE_DIR} ") #path to config.h
+    string(COMPARE EQUAL "${RUBY_INCLUDE_DIR}" "${RUBY_CONFIG_INCLUDE_DIR}" operation)
+    if(NOT operation)
+      SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${RUBY_INCLUDE_DIR} ") #path to ruby.h
+    endif(NOT operation)
+    ADD_DEFINITIONS("-I${CMAKE_HOME_DIRECTORY}/src/bindings/ruby -I${CMAKE_HOME_DIRECTORY}/src/simix")
+    SET(HAVE_RUBY 1)
+  else(RUBY_VERSION_MAJOR MATCHES "1" AND RUBY_VERSION_MINOR MATCHES "9")
+    message(STATUS "Warning: Ruby bindings need version 1.9.x, but found version ${RUBY_VERSION_MAJOR}.${RUBY_VERSION_MINOR}.x")
+    SET(HAVE_RUBY 0)
+  endif(RUBY_VERSION_MAJOR MATCHES "1" AND RUBY_VERSION_MINOR MATCHES "9")
 else(RUBY_LIBRARY)
-       SET(HAVE_RUBY 0)
+  SET(HAVE_RUBY 0)
 endif(RUBY_LIBRARY)
 
 if(NOT RUBY_EXECUTABLE)
-       message(STATUS "Warning: you are missing the ruby executable, so you can compile and build examples but can't execute them!")
+  message(STATUS "Warning: you are missing the ruby executable, so you can compile and build examples but can't execute them!")
 endif(NOT RUBY_EXECUTABLE)
\ No newline at end of file
index 69b55de..d29da73 100644 (file)
@@ -2,66 +2,66 @@
 #YOU CAN SPECIFY SIMGRID_ROOT OR GRAS_ROOT
 
 # TO CALL THIS FILE USE
-       #set(CMAKE_MODULE_PATH 
-       #${CMAKE_MODULE_PATH}
-       #${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Modules
-       #)
+#set(CMAKE_MODULE_PATH
+#${CMAKE_MODULE_PATH}
+#${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Modules
+#)
 
 find_library(HAVE_SIMGRID_LIB
-    NAME simgrid
-    HINTS
-    $ENV{LD_LIBRARY_PATH}
-    $ENV{GRAS_ROOT}
-       $ENV{SIMGRID_ROOT}
-    PATH_SUFFIXES lib64 lib
-    PATHS
-    /opt
-    /opt/local
-    /opt/csw
-    /sw
-    /usr
-)
+  NAME simgrid
+  HINTS
+  $ENV{LD_LIBRARY_PATH}
+  $ENV{GRAS_ROOT}
+  $ENV{SIMGRID_ROOT}
+  PATH_SUFFIXES lib64 lib
+  PATHS
+  /opt
+  /opt/local
+  /opt/csw
+  /sw
+  /usr
+  )
 
 find_path(HAVE_GRAS_H gras.h
-    HINTS
-    $ENV{GRAS_ROOT}
-       $ENV{SIMGRID_ROOT}
-    PATH_SUFFIXES include
-    PATHS
-    /opt
-    /opt/local
-    /opt/csw
-    /sw
-    /usr
-)
+  HINTS
+  $ENV{GRAS_ROOT}
+  $ENV{SIMGRID_ROOT}
+  PATH_SUFFIXES include
+  PATHS
+  /opt
+  /opt/local
+  /opt/csw
+  /sw
+  /usr
+  )
 
 find_program(HAVE_TESH
-       NAMES tesh
-       HINTS
-       $ENV{GRAS_ROOT}
-       $ENV{SIMGRID_ROOT}
-       PATH_SUFFIXES bin
-       PATHS
-       /opt
-       /opt/local
-       /opt/csw
-       /sw
-       /usr
-)
+  NAMES tesh
+  HINTS
+  $ENV{GRAS_ROOT}
+  $ENV{SIMGRID_ROOT}
+  PATH_SUFFIXES bin
+  PATHS
+  /opt
+  /opt/local
+  /opt/csw
+  /sw
+  /usr
+  )
 
 find_program(HAVE_GRAS_STUB
-       NAMES gras_stub_generator
-       HINTS
-       $ENV{GRAS_ROOT}
-       $ENV{SIMGRID_ROOT}
-       PATH_SUFFIXES bin
-       PATHS
-       /opt
-       /opt/local
-       /opt/csw
-       /sw
-       /usr
-)
+  NAMES gras_stub_generator
+  HINTS
+  $ENV{GRAS_ROOT}
+  $ENV{SIMGRID_ROOT}
+  PATH_SUFFIXES bin
+  PATHS
+  /opt
+  /opt/local
+  /opt/csw
+  /sw
+  /usr
+  )
 
 message(STATUS "Looking for lib SimGrid")
 if(HAVE_SIMGRID_LIB)
@@ -71,7 +71,7 @@ if(HAVE_SIMGRID_LIB)
   string(REGEX MATCH "^[0-9]" SIMGRID_MAJOR_VERSION "${simgrid_version}")
   string(REGEX MATCH "^[0-9].[0-9]" SIMGRID_MINOR_VERSION "${simgrid_version}")
   string(REGEX MATCH "^[0-9].[0-9].[0-9]" SIMGRID_PATCH_VERSION "${simgrid_version}")
-  string(REGEX REPLACE "^${SIMGRID_MINOR_VERSION}." "" SIMGRID_PATCH_VERSION "${SIMGRID_PATCH_VERSION}") 
+  string(REGEX REPLACE "^${SIMGRID_MINOR_VERSION}." "" SIMGRID_PATCH_VERSION "${SIMGRID_PATCH_VERSION}")
   string(REGEX REPLACE "^${SIMGRID_MAJOR_VERSION}." "" SIMGRID_MINOR_VERSION "${SIMGRID_MINOR_VERSION}")
   message(STATUS "Simgrid version : ${SIMGRID_MAJOR_VERSION}.${SIMGRID_MINOR_VERSION}")
 else(HAVE_SIMGRID_LIB)
@@ -80,15 +80,15 @@ endif(HAVE_SIMGRID_LIB)
 
 message(STATUS "Looking for gras.h")
 if(HAVE_GRAS_H)
-message(STATUS "Looking for gras.h - found")
+  message(STATUS "Looking for gras.h - found")
 else(HAVE_GRAS_H)
-message(STATUS "Looking for gras.h - not found")
+  message(STATUS "Looking for gras.h - not found")
 endif(HAVE_GRAS_H)
 
 if(HAVE_TESH)
-message(STATUS "Found Tesh: ${HAVE_TESH}")
+  message(STATUS "Found Tesh: ${HAVE_TESH}")
 endif(HAVE_TESH)
 
 if(HAVE_GRAS_STUB)
-message(STATUS "Found gras_stub_generator: ${HAVE_GRAS_STUB}")
+  message(STATUS "Found gras_stub_generator: ${HAVE_GRAS_STUB}")
 endif(HAVE_GRAS_STUB)
\ No newline at end of file
index 9d764f8..9cfcfc0 100644 (file)
@@ -1,35 +1,35 @@
-find_program(VALGRIND_EXE 
-       NAME valgrind
-    PATH_SUFFIXES bin/
-    PATHS
-    /opt
-    /opt/local
-    /opt/csw
-    /sw
-    /usr
-)
+find_program(VALGRIND_EXE
+  NAME valgrind
+  PATH_SUFFIXES bin/
+  PATHS
+  /opt
+  /opt/local
+  /opt/csw
+  /sw
+  /usr
+  )
 
 if(VALGRIND_EXE)
-message(STATUS "Found valgrind: ${VALGRIND_EXE}")
-SET(VALGRIND_COMMAND "${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Scripts/my_valgrind.pl")
-SET(MEMORYCHECK_COMMAND "${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Scripts/my_valgrind.pl")
+  message(STATUS "Found valgrind: ${VALGRIND_EXE}")
+  SET(VALGRIND_COMMAND "${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Scripts/my_valgrind.pl")
+  SET(MEMORYCHECK_COMMAND "${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Scripts/my_valgrind.pl")
 endif(VALGRIND_EXE)
 
 if(VALGRIND_EXE)
-       exec_program("${VALGRIND_EXE} --version " OUTPUT_VARIABLE "VALGRIND_VERSION")
-       string(REGEX MATCH "[0-9].[0-9].[0-9]" NEW_VALGRIND_VERSION "${VALGRIND_VERSION}")
-       if(NEW_VALGRIND_VERSION)
-               message(STATUS "Valgrind version: ${NEW_VALGRIND_VERSION}")
-               exec_program("${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Scripts/generate_memcheck_tests.pl ${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/AddTests.cmake > ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/memcheck_tests.cmake" OUTPUT_VARIABLE SHUTT)
-               set(MEMORYCHECK_COMMAND_OPTIONS "--trace-children=yes --leak-check=full --show-reachable=yes --track-origins=yes --read-var-info=no")
-               message(STATUS "Valgrind options: ${MEMORYCHECK_COMMAND_OPTIONS}")
-       else(NEW_VALGRIND_VERSION)
-               set(enable_memcheck false)
-               message(STATUS "Error: Command valgrind not found --> enable_memcheck autoset to false.")
-       endif(NEW_VALGRIND_VERSION)
+  exec_program("${VALGRIND_EXE} --version " OUTPUT_VARIABLE "VALGRIND_VERSION")
+  string(REGEX MATCH "[0-9].[0-9].[0-9]" NEW_VALGRIND_VERSION "${VALGRIND_VERSION}")
+  if(NEW_VALGRIND_VERSION)
+    message(STATUS "Valgrind version: ${NEW_VALGRIND_VERSION}")
+    exec_program("${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Scripts/generate_memcheck_tests.pl ${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/AddTests.cmake > ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/memcheck_tests.cmake" OUTPUT_VARIABLE SHUTT)
+    set(MEMORYCHECK_COMMAND_OPTIONS "--trace-children=yes --leak-check=full --show-reachable=yes --track-origins=yes --read-var-info=no")
+    message(STATUS "Valgrind options: ${MEMORYCHECK_COMMAND_OPTIONS}")
+  else(NEW_VALGRIND_VERSION)
+    set(enable_memcheck false)
+    message(STATUS "Error: Command valgrind not found --> enable_memcheck autoset to false.")
+  endif(NEW_VALGRIND_VERSION)
 else(VALGRIND_EXE)
-       set(enable_memcheck false)
-       message(FATAL_ERROR "Command valgrind not found --> enable_memcheck autoset to false.")
+  set(enable_memcheck false)
+  message(FATAL_ERROR "Command valgrind not found --> enable_memcheck autoset to false.")
 endif(VALGRIND_EXE)
 
 mark_as_advanced(VALGRIND_EXE)
\ No newline at end of file
index d8573b7..0cdc764 100644 (file)
@@ -6,9 +6,9 @@ set(gtnets_path ${gtnets_path} CACHE PATH "Path to gtnets lib and include")
 set(ns3_path ${ns3_path} CACHE PATH "Path to ns3 lib and include")
 
 if(NOT CMAKE_INSTALL_PREFIX)
-       set(CMAKE_INSTALL_PREFIX "/usr/local/simgrid/" CACHE PATH "Path where to install project")
+  set(CMAKE_INSTALL_PREFIX "/usr/local/simgrid/" CACHE PATH "Path where to install project")
 else(NOT CMAKE_INSTALL_PREFIX)
-       set(CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE PATH "Path where to install project")
+  set(CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE PATH "Path where to install project")
 endif(NOT CMAKE_INSTALL_PREFIX)
 
 set(pipol_user ${pipol_user} CACHE TYPE INTERNAL FORCE)
@@ -62,9 +62,9 @@ mark_as_advanced(ICONV_PATH)
 mark_as_advanced(MAKE_PATH)
 mark_as_advanced(SVN)
 mark_as_advanced(GIT)
-mark_as_advanced(CMAKE_OSX_ARCHITECTURES)                                                                                                                  
-mark_as_advanced(CMAKE_OSX_DEPLOYMENT_TARGET)                                                                                                              
-mark_as_advanced(CMAKE_OSX_SYSROOT)                                                                         
+mark_as_advanced(CMAKE_OSX_ARCHITECTURES)
+mark_as_advanced(CMAKE_OSX_DEPLOYMENT_TARGET)
+mark_as_advanced(CMAKE_OSX_SYSROOT)
 mark_as_advanced(SED_EXE)
 mark_as_advanced(BIBTEX2HTML)
 mark_as_advanced(CMAKE_C_LINK_FLAGS)
index 75b4e9c..a225176 100644 (file)
 
 #SET(PIPOL_USER $ENV{PIPOL_USER})
 
-# ssh/rsync mandatory 
+# ssh/rsync mandatory
 IF(pipol_user)
 
-       set(CMAKE_OPTIONS "     -Wno-dev")
-       
-       if(with_context)
-       set(CMAKE_OPTIONS "${CMAKE_OPTIONS}     -Dwith_context=${with_context}")
-       endif(with_context)
-       
-       if(enable_smpi)
-       set(CMAKE_OPTIONS "${CMAKE_OPTIONS}     -Denable_smpi=on")
-       endif(enable_smpi)
-       
-       if(enable_lua)
-       set(CMAKE_OPTIONS "${CMAKE_OPTIONS}     -Denable_lua=on")
-       endif(enable_lua)       
-       
-       if(enable_compile_optimizations)
-       set(CMAKE_OPTIONS "${CMAKE_OPTIONS}     -Denable_compile_optimizations=on")
-       endif(enable_compile_optimizations)
-       
-       if(enable_compile_warnings)
-       set(CMAKE_OPTIONS "${CMAKE_OPTIONS}     -Denable_compile_warnings=on")
-       endif(enable_compile_warnings)  
-       
-       if(enable_tracing)
-       set(CMAKE_OPTIONS "${CMAKE_OPTIONS}     -Denable_tracing=on")
-       endif(enable_tracing)
-       
-       if(enable_coverage)
-       set(CMAKE_OPTIONS "${CMAKE_OPTION}      -Denable_coverage=on")
-       endif(enable_coverage)  
-       
-       if(enable_print_message)        
-       set(CMAKE_OPTIONS "${CMAKE_OPTIONS}     -Denable_print_message=on")
-       endif(enable_print_message)     
-       
-       if(enable_model-checking)
-       set(CMAKE_OPTIONS "${CMAKE_OPTIONS}     -Denable_model-checking=on")
-       endif(enable_model-checking)
-       
-    if(enable_latency_bound_tracking)
-       set(CMAKE_OPTIONS "${CMAKE_OPTIONS}     -Denable_latency_bound_tracking=on")
-       endif(enable_latency_bound_tracking)
-
-       FIND_PROGRAM(HAVE_SSH ssh)
-       FIND_PROGRAM(HAVE_RSYNC rsync)
-
-    MESSAGE(STATUS "Pipol user is ${pipol_user}")
-    IF(HAVE_SSH)
-       message(STATUS "Found ssh: ${HAVE_SSH}")
-      # get pipol systems
-      EXECUTE_PROCESS(COMMAND 
-        ssh ${pipol_user}@pipol.inria.fr pipol-sub --query=systems 
-        OUTPUT_VARIABLE PIPOL_SYSTEMS OUTPUT_STRIP_TRAILING_WHITESPACE)
-        
-    ENDIF(HAVE_SSH)
-  
-       ADD_CUSTOM_TARGET(pipol_test_list_images
-               COMMENT "Available images for pipol tests (cmake + make + make test) : "
-               )
-               
-       ADD_CUSTOM_TARGET(pipol_experimental_list_images
-               COMMENT "Available images for ctest (ctest -D Experimental) : "
-               )
-               
-       ADD_CUSTOM_TARGET(pipol_kvm_deploy
-               COMMENT "Deploy all kvm images on pipol (ctest -D Experimental) : "
-               )
-       ADD_CUSTOM_COMMAND(TARGET pipol_kvm_deploy
-               POST_BUILD
-               COMMENT "See results on http://cdash.inria.fr/CDash/index.php?project=Simgrid"
-               )
-  
-    IF(HAVE_RSYNC)
-       message(STATUS "Found rsync: ${HAVE_RSYNC}")
-             MACRO(PIPOL_TARGET
-                 SYSTEM_PATTERN)
-                        &nbs