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
Don't use -pthreads on Mac OS X
[simgrid.git]
/
buildtools
/
Cmake
/
MakeLib.cmake
diff --git
a/buildtools/Cmake/MakeLib.cmake
b/buildtools/Cmake/MakeLib.cmake
index
3e3e538
..
d28e29d
100644
(file)
--- a/
buildtools/Cmake/MakeLib.cmake
+++ b/
buildtools/Cmake/MakeLib.cmake
@@
-33,6
+33,7
@@
endif()
# Compute the dependencies of SimGrid
#####################################
set(SIMGRID_DEP "-lm")
# Compute the dependencies of SimGrid
#####################################
set(SIMGRID_DEP "-lm")
+set(SIMGRID_DEP "${SIMGRID_DEP} ${Boost_CONTEXT_LIBRARY}")
if(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD"
AND NOT ${CMAKE_SYSTEM_VERSION} VERSION_LESS 10.0
if(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD"
AND NOT ${CMAKE_SYSTEM_VERSION} VERSION_LESS 10.0
@@
-55,10
+56,9
@@
else()
set(SIMGRID_DEP "${SIMGRID_DEP} -lstdc++")
endif()
set(SIMGRID_DEP "${SIMGRID_DEP} -lstdc++")
endif()
-if(pthread)
- if(${CONTEXT_THREADS})
- SET(SIMGRID_DEP "${SIMGRID_DEP} -pthread")
- endif()
+if(pthread AND ${CONTEXT_THREADS} AND NOT APPLE)
+ # Clang on recent Mac OS X is not happy about -pthread.
+ SET(SIMGRID_DEP "${SIMGRID_DEP} -pthread")
endif()
if(HAVE_LUA)
endif()
if(HAVE_LUA)