revert [a30523e] (remove supernovae) because I need some timings on G5K, and fix...

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

diff --git a/buildtools/Cmake/MakeLib.cmake b/buildtools/Cmake/MakeLib.cmake
index 9640ac4..9bc0d11 100644 (file)
--- a/buildtools/Cmake/MakeLib.cmake
+++ b/buildtools/Cmake/MakeLib.cmake
@@ -47,7 +47,7 @@ endif(enable_supernovae)
 
 # Compute the dependencies of GRAS
 ##################################
-set(GRAS_DEP "-lm -lpthread")
+set(GRAS_DEP "-lm -pthread")
 
 if(HAVE_POSIX_GETTIME)
        SET(GRAS_DEP "${GRAS_DEP} -lrt")
@@ -70,7 +70,7 @@ set(SIMGRID_DEP "-lm -lpcre")
 
 if(pthread)
        if(${CONTEXT_THREADS})
-               SET(SIMGRID_DEP "${SIMGRID_DEP} -lpthread")
+               SET(SIMGRID_DEP "${SIMGRID_DEP} -pthread")
        endif(${CONTEXT_THREADS})       
 endif(pthread)
 
@@ -120,15 +120,10 @@ if(HAVE_NS3)
            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")
+           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_NS3 AND HAVE_RED_QUEUE_H)
-           set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_HAVE_NS3_RED")
-           set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_HAVE_NS3_RED")
-endif(HAVE_NS3 AND HAVE_RED_QUEUE_H)
-
 if(HAVE_POSIX_GETTIME)
        SET(SIMGRID_DEP "${SIMGRID_DEP} -lrt")
 endif(HAVE_POSIX_GETTIME)