Remove option for pcre from cmake files and from sources.

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

diff --git a/buildtools/Cmake/MakeLib.cmake b/buildtools/Cmake/MakeLib.cmake
index 1c41430..9640ac4 100644 (file)
--- a/buildtools/Cmake/MakeLib.cmake
+++ b/buildtools/Cmake/MakeLib.cmake
@@ -66,10 +66,7 @@ target_link_libraries(gras   ${GRAS_DEP})
 
 # Compute the dependencies of SimGrid
 #####################################
-set(SIMGRID_DEP "-lm")
-if(HAVE_PCRE_LIB)
-       SET(SIMGRID_DEP "${SIMGRID_DEP} -lpcre")
-endif(HAVE_PCRE_LIB)
+set(SIMGRID_DEP "-lm -lpcre")
 
 if(pthread)
        if(${CONTEXT_THREADS})
@@ -118,9 +115,20 @@ if(HAVE_GTNETS)
 endif(HAVE_GTNETS)
 
 if(HAVE_NS3)
-       SET(SIMGRID_DEP "${SIMGRID_DEP} -lns3")
+    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")
+       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)