Link with -ldl when using dlsym.

[simgrid.git] / buildtools / Cmake / MakeLib.cmake

diff --git a/buildtools/Cmake/MakeLib.cmake b/buildtools/Cmake/MakeLib.cmake
index 11d16ef..bce4151 100644 (file)
--- a/buildtools/Cmake/MakeLib.cmake
+++ b/buildtools/Cmake/MakeLib.cmake
@@ -11,9 +11,6 @@ include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Supernovae.cmake)
 add_library(simgrid SHARED ${simgrid_sources})
 set_target_properties(simgrid PROPERTIES VERSION ${libsimgrid_version})
 
-add_library(gras SHARED ${gras_sources})
-set_target_properties(gras PROPERTIES VERSION ${libgras_version})
-
 if(enable_lib_static)
   add_library(simgrid_static STATIC ${simgrid_sources})
 endif()
@@ -26,7 +23,6 @@ if(enable_smpi)
   endif()
 endif()
 
-add_dependencies(gras maintainer_files)
 add_dependencies(simgrid maintainer_files)
 
 # if supernovaeing, we need some depends to make sure that the source gets generated
@@ -35,7 +31,6 @@ if (enable_supernovae)
   if(enable_lib_static)
     add_dependencies(simgrid_static ${CMAKE_CURRENT_BINARY_DIR}/src/supernovae_sg.c)
   endif()
-  add_dependencies(gras ${CMAKE_CURRENT_BINARY_DIR}/src/supernovae_gras.c)
 
   if(enable_smpi)
     add_dependencies(smpi ${CMAKE_CURRENT_BINARY_DIR}/src/supernovae_smpi.c)
@@ -45,25 +40,6 @@ if (enable_supernovae)
   endif()
 endif()
 
-# Compute the dependencies of GRAS
-##################################
-set(GRAS_DEP "-lm -pthread")
-
-if(HAVE_POSIX_GETTIME)
-  SET(GRAS_DEP "${GRAS_DEP} -lrt")
-endif()
-
-# the following is probably unneed since it kills the previous
-# GRAS_DEP (and is thus probably invalid).
-# My guess is that pthread is never true [Mt]
-# FIXME: KILLME if we get a working windows with that?
-if(with_context MATCHES windows)
-  if(pthread)
-    SET(GRAS_DEP "msg")
-  endif()
-endif()
-target_link_libraries(gras     ${GRAS_DEP})
-
 # Compute the dependencies of SimGrid
 #####################################
 set(SIMGRID_DEP "-lm -lpcre")
@@ -127,6 +103,10 @@ if(HAVE_MC)
   endif()
 endif()
 
+if(MMALLOC_WANT_OVERRIDE_LEGACY AND HAVE_GNU_LD)
+  SET(SIMGRID_DEP "${SIMGRID_DEP} -ldl")
+endif()
+
 if(HAVE_NS3)
   if(${NS3_VERSION} EQUAL 310)
     SET(SIMGRID_DEP "${SIMGRID_DEP} -lns3")
@@ -145,12 +125,12 @@ target_link_libraries(simgrid     ${SIMGRID_DEP})
 
 # Compute the dependencies of SMPI
 ##################################
-set(SMPI_LDEP "")
+set(SMPI_DEP "")
 if(APPLE)
-  set(SMPI_LDEP "-Wl,-U -Wl,_smpi_simulated_main")
+  set(SMPI_DEP "-Wl,-U -Wl,_smpi_simulated_main")
 endif()
 if(enable_smpi)
-  target_link_libraries(smpi   simgrid ${SMPI_LDEP})
+  target_link_libraries(smpi   simgrid ${SMPI_DEP})
 endif()
 
 # Pass dependencies to static libs
@@ -160,7 +140,7 @@ if(enable_lib_static)
   add_dependencies(simgrid_static maintainer_files)
   set_target_properties(simgrid_static PROPERTIES OUTPUT_NAME simgrid)
   if(enable_smpi)
-    target_link_libraries(smpi_static  simgrid ${SMPI_LDEP})
+    target_link_libraries(smpi_static  simgrid ${SMPI_DEP})
     set_target_properties(smpi_static PROPERTIES OUTPUT_NAME smpi)
   endif()
 endif()