X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f4ed74ca6d4a744d2956a4f2906c897e1886cefd..40a6b57b33ba92df9a10600b8d6fa10fff80c9d2:/buildtools/Cmake/MakeLib.cmake diff --git a/buildtools/Cmake/MakeLib.cmake b/buildtools/Cmake/MakeLib.cmake index e9777ee78f..fc8d150b64 100644 --- a/buildtools/Cmake/MakeLib.cmake +++ b/buildtools/Cmake/MakeLib.cmake @@ -58,7 +58,7 @@ else() set(SIMGRID_DEP "${SIMGRID_DEP} -lstdc++") endif() -if(pthread AND ${CONTEXT_THREADS} AND NOT APPLE) +if(HAVE_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() @@ -103,10 +103,6 @@ if(HAVE_LIBSIGC++) SET(SIMGRID_DEP "${SIMGRID_DEP} -lsigc-2.0") endif() -if(HAVE_GTNETS) - SET(SIMGRID_DEP "${SIMGRID_DEP} -lgtnets") -endif() - if(HAVE_MC) # The availability of libunwind was checked in CompleteInFiles.cmake # (that includes FindLibunwind.cmake), so simply load it now. @@ -129,7 +125,7 @@ if(MMALLOC_WANT_OVERRIDE_LEGACY AND HAVE_GNU_LD) endif() if(HAVE_NS3) - SET(SIMGRID_DEP "${SIMGRID_DEP} -lns3.${NS3_VERSION_MINOR}-core -lns3.${NS3_VERSION_MINOR}-csma -lns3.${NS3_VERSION_MINOR}-point-to-point -lns3.${NS3_VERSION_MINOR}-internet -lns3.${NS3_VERSION_MINOR}-applications") + SET(SIMGRID_DEP "${SIMGRID_DEP} -lns${NS3_VERSION}-core -lns${NS3_VERSION}-csma -lns${NS3_VERSION}-point-to-point -lns${NS3_VERSION}-internet -lns${NS3_VERSION}-applications") endif() if(HAVE_POSIX_GETTIME)