Update Changelog

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

diff --git a/buildtools/Cmake/MakeExeLib.cmake b/buildtools/Cmake/MakeExeLib.cmake
index 0445d4c..bc3b256 100644 (file)
--- a/buildtools/Cmake/MakeExeLib.cmake
+++ b/buildtools/Cmake/MakeExeLib.cmake
@@ -63,10 +63,11 @@ endif(HAVE_POSIX_GETTIME)
 # GRAS_DEP (and is thus probably invalid).
 # My guess is that pthread is never true [Mt]
 # FIXME: KILLME if we get a working windows with that?
-if(pthread AND (with_context MATCHES windows))
+if(with_context MATCHES windows)
+if(pthread)
                SET(GRAS_DEP "msg")
-endif(pthread AND (with_context MATCHES windows))
-
+endif(pthread)
+endif(with_context MATCHES windows)
 target_link_libraries(gras     ${GRAS_DEP})
 
 # Compute the dependencies of SimGrid
@@ -167,7 +168,6 @@ add_subdirectory(${PROJECT_DIRECTORY}/tools/tesh)
 
 add_subdirectory(${PROJECT_DIRECTORY}/testsuite/xbt)
 add_subdirectory(${PROJECT_DIRECTORY}/testsuite/surf)
-add_subdirectory(${PROJECT_DIRECTORY}/testsuite/simdag)
 add_subdirectory(${PROJECT_DIRECTORY}/teshsuite/xbt)
 add_subdirectory(${PROJECT_DIRECTORY}/teshsuite/gras/datadesc)
 add_subdirectory(${PROJECT_DIRECTORY}/teshsuite/gras/msg_handle)