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
get ride of a stupid header file
[simgrid.git]
/
tools
/
cmake
/
MakeLib.cmake
diff --git
a/tools/cmake/MakeLib.cmake
b/tools/cmake/MakeLib.cmake
index
2dbc52e
..
995dd7f
100644
(file)
--- a/
tools/cmake/MakeLib.cmake
+++ b/
tools/cmake/MakeLib.cmake
@@
-25,11
+25,11
@@
endif()
# Compute the dependencies of SimGrid
#####################################
set(SIMGRID_DEP "-lm")
# Compute the dependencies of SimGrid
#####################################
set(SIMGRID_DEP "-lm")
-if (HAVE_BOOST_CONTEXT)
+if (HAVE_BOOST_CONTEXT
S
)
set(SIMGRID_DEP "${SIMGRID_DEP} ${Boost_CONTEXT_LIBRARY}")
endif()
set(SIMGRID_DEP "${SIMGRID_DEP} ${Boost_CONTEXT_LIBRARY}")
endif()
-if(HAVE_PTHREAD AND ${
CONTEXT_THREAD
S} AND NOT APPLE)
+if(HAVE_PTHREAD AND ${
HAVE_THREAD_CONTEXT
S} AND NOT APPLE)
# Clang on recent Mac OS X is not happy about -pthread.
SET(SIMGRID_DEP "${SIMGRID_DEP} -pthread")
endif()
# Clang on recent Mac OS X is not happy about -pthread.
SET(SIMGRID_DEP "${SIMGRID_DEP} -pthread")
endif()
@@
-70,7
+70,7
@@
if(HAVE_GRAPHVIZ)
endif()
endif()
endif()
endif()
-if(
HAVE_LIBSIGC++
)
+if(
SIMGRID_HAVE_LIBSIG
)
SET(SIMGRID_DEP "${SIMGRID_DEP} -lsigc-2.0")
add_definitions(-DLIBSIGC)
endif()
SET(SIMGRID_DEP "${SIMGRID_DEP} -lsigc-2.0")
add_definitions(-DLIBSIGC)
endif()