moving graphicator from teshsuite to tools/graphicator/

[simgrid.git] / buildtools / Cmake / MakeExeLib.cmake

diff --git a/buildtools/Cmake/MakeExeLib.cmake b/buildtools/Cmake/MakeExeLib.cmake
index 2e6d0ce..fb130d2 100644 (file)
--- a/buildtools/Cmake/MakeExeLib.cmake
+++ b/buildtools/Cmake/MakeExeLib.cmake
@@ -90,9 +90,9 @@ if(HAVE_RUBY)
 endif(HAVE_RUBY)
 
 if(pthread)
-       if(with_context MATCHES pthread)
+       if(${CONTEXT_THREADS})
                SET(SIMGRID_DEP "${SIMGRID_DEP} -lpthread")
-       endif(with_context MATCHES pthread)     
+       endif(${CONTEXT_THREADS})       
 endif(pthread)
 
 if(HAVE_LUA)     
@@ -164,7 +164,18 @@ endif(enable_lib_static)
 ### Load all files declaring binaries (tools, examples and tests) #
 ###################################################################
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/tools/gras)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/tools/tesh)
+
+if(WIN32)
+       add_custom_target(tesh ALL
+       DEPENDS ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl
+       COMMENT "Install ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl"
+       COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_BINARY_DIR}/bin/tesh
+       )
+else(WIN32)
+       add_subdirectory(${CMAKE_HOME_DIRECTORY}/tools/tesh)
+endif(WIN32)
+
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/tools/graphicator/)
 
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/testsuite/xbt)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/testsuite/surf)
@@ -205,6 +216,7 @@ add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/trace)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/tracing)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/icomms)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/chord)
 
 if(HAVE_MC)
        add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/mc)