A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
3432d7f
..
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
#####################################
# 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})
if(pthread)
if(${CONTEXT_THREADS})
@@
-127,6
+124,11
@@
if(HAVE_NS3)
endif(${NS3_VERSION} EQUAL 310)
endif(HAVE_NS3)
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)
if(HAVE_POSIX_GETTIME)
SET(SIMGRID_DEP "${SIMGRID_DEP} -lrt")
endif(HAVE_POSIX_GETTIME)