X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/53b9ff1b6972dffeabd543a09c89170663c30ad1..bb52ef5fabdd283019a32fb5d812b5e40127bea5:/tools/cmake/MakeLib.cmake

diff --git a/tools/cmake/MakeLib.cmake b/tools/cmake/MakeLib.cmake
index 91aa064796..95ce4604a1 100644
--- a/tools/cmake/MakeLib.cmake
+++ b/tools/cmake/MakeLib.cmake
@@ -20,7 +20,6 @@ endif()
 
 # Compute the dependencies of SimGrid
 #####################################
-set(SIMGRID_DEP "-lm")
 if (HAVE_BOOST_CONTEXTS)
   set(SIMGRID_DEP "${SIMGRID_DEP} ${Boost_CONTEXT_LIBRARY}")
 endif()
@@ -56,6 +55,10 @@ if(HAVE_LUA)
   SET(SIMGRID_DEP "${SIMGRID_DEP} ${LUA_LIBRARY} -ldl")
 endif()
 
+if(HAVE_PAPI)
+  SET(SIMGRID_DEP "${SIMGRID_DEP} -lpapi")
+endif()
+
 if(HAVE_GRAPHVIZ)
   if(HAVE_CGRAPH_LIB)
     SET(SIMGRID_DEP "${SIMGRID_DEP} -lcgraph")
@@ -66,30 +69,8 @@ if(HAVE_GRAPHVIZ)
   endif()
 endif()
 
-if(SIMGRID_HAVE_LIBSIG)
-  SET(SIMGRID_DEP "${SIMGRID_DEP} -lsigc-2.0")
-  add_definitions(-DLIBSIGC)
-endif()
-
-if(HAVE_MC)
-  # The availability of libunwind was checked in CompleteInFiles.cmake
-  #   (that includes FindLibunwind.cmake), so simply load it now.
-
-  SET(SIMGRID_DEP "${SIMGRID_DEP} -lunwind -lunwind-ptrace")
-
-  # Same for libdw
-  SET(SIMGRID_DEP "${SIMGRID_DEP} -ldw")
-  # This supposes that the host machine is either an AMD or a X86.
-  # This is deeply wrong, and should be fixed by manually loading -lunwind-PLAT (FIXME)
-  if(PROCESSOR_x86_64)
-    SET(SIMGRID_DEP "${SIMGRID_DEP} -lunwind-x86_64")
-  else()
-    SET(SIMGRID_DEP "${SIMGRID_DEP} -lunwind-x86")
-  endif()
-endif()
-
-if(MMALLOC_WANT_OVERRIDE_LEGACY AND HAVE_GNU_LD)
-  SET(SIMGRID_DEP "${SIMGRID_DEP} ${DL_LIBRARY}")
+if(HAVE_MC AND HAVE_GNU_LD)
+  SET(SIMGRID_DEP "${SIMGRID_DEP} -ldl")
 endif()
 
 if(HAVE_NS3)
@@ -100,10 +81,6 @@ if(HAVE_POSIX_GETTIME)
   SET(SIMGRID_DEP "${SIMGRID_DEP} -lrt")
 endif()
 
-if(HAVE_BACKTRACE_IN_LIBEXECINFO)
-  SET(SIMGRID_DEP "${SIMGRID_DEP} -lexecinfo")
-endif(HAVE_BACKTRACE_IN_LIBEXECINFO)
-
 # Compute the dependencies of SMPI
 ##################################
 if(enable_smpi AND APPLE)
@@ -114,6 +91,9 @@ target_link_libraries(simgrid 	${SIMGRID_DEP})
 
 # Dependencies from maintainer mode
 ###################################
+if(enable_maintainer_mode)
+  add_dependencies(simgrid smpi_generated_headers_call_location_tracing)
+endif()
 if(enable_maintainer_mode AND PYTHON_EXE)
   add_dependencies(simgrid simcalls_generated_src)
 endif()