X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c33130ef26223f8b6775db83287303742a5cfa05..c7061a82b255f05ad7e1f0a03acc34433e02f4fa:/tools/cmake/MakeLib.cmake diff --git a/tools/cmake/MakeLib.cmake b/tools/cmake/MakeLib.cmake index 10bf2ea447..995dd7f177 100644 --- a/tools/cmake/MakeLib.cmake +++ b/tools/cmake/MakeLib.cmake @@ -25,11 +25,11 @@ endif() # Compute the dependencies of SimGrid ##################################### set(SIMGRID_DEP "-lm") -if (HAVE_BOOST_CONTEXT) +if (HAVE_BOOST_CONTEXTS) set(SIMGRID_DEP "${SIMGRID_DEP} ${Boost_CONTEXT_LIBRARY}") endif() -if(HAVE_PTHREAD AND ${CONTEXT_THREADS} AND NOT APPLE) +if(HAVE_PTHREAD AND ${HAVE_THREAD_CONTEXTS} AND NOT APPLE) # Clang on recent Mac OS X is not happy about -pthread. SET(SIMGRID_DEP "${SIMGRID_DEP} -pthread") endif() @@ -70,8 +70,9 @@ if(HAVE_GRAPHVIZ) endif() endif() -if(HAVE_LIBSIGC++) +if(SIMGRID_HAVE_LIBSIG) SET(SIMGRID_DEP "${SIMGRID_DEP} -lsigc-2.0") + add_definitions(-DLIBSIGC) endif() if(HAVE_MC)