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 d37b8bf..bce4151 100644 (file)
--- a/buildtools/Cmake/MakeLib.cmake
+++ b/buildtools/Cmake/MakeLib.cmake
@@ -11,22 +11,18 @@ 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(enable_lib_static)
+endif()
 
 if(enable_smpi)
   add_library(smpi SHARED ${SMPI_SRC})
   set_target_properties(smpi PROPERTIES VERSION ${libsmpi_version})
   if(enable_lib_static)
     add_library(smpi_static STATIC ${SMPI_SRC})
-  endif(enable_lib_static)
-endif(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
@@ -34,35 +30,15 @@ if (enable_supernovae)
   add_dependencies(simgrid ${CMAKE_CURRENT_BINARY_DIR}/src/supernovae_sg.c)
   if(enable_lib_static)
     add_dependencies(simgrid_static ${CMAKE_CURRENT_BINARY_DIR}/src/supernovae_sg.c)
-  endif(enable_lib_static)
-  add_dependencies(gras ${CMAKE_CURRENT_BINARY_DIR}/src/supernovae_gras.c)
+  endif()
 
   if(enable_smpi)
     add_dependencies(smpi ${CMAKE_CURRENT_BINARY_DIR}/src/supernovae_smpi.c)
     if(enable_lib_static)
       add_dependencies(smpi_static ${CMAKE_CURRENT_BINARY_DIR}/src/supernovae_smpi.c)
-    endif(enable_lib_static)
-  endif(enable_smpi)
-endif(enable_supernovae)
-
-# Compute the dependencies of GRAS
-##################################
-set(GRAS_DEP "-lm -pthread")
-
-if(HAVE_POSIX_GETTIME)
-  SET(GRAS_DEP "${GRAS_DEP} -lrt")
-endif(HAVE_POSIX_GETTIME)
-
-# 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(pthread)
-endif(with_context MATCHES windows)
-target_link_libraries(gras     ${GRAS_DEP})
+    endif()
+  endif()
+endif()
 
 # Compute the dependencies of SimGrid
 #####################################
@@ -71,8 +47,8 @@ set(SIMGRID_DEP "-lm -lpcre")
 if(pthread)
   if(${CONTEXT_THREADS})
     SET(SIMGRID_DEP "${SIMGRID_DEP} -pthread")
-  endif(${CONTEXT_THREADS})
-endif(pthread)
+  endif()
+endif()
 
 if(HAVE_LUA)
   ADD_CUSTOM_TARGET(link_simgrid_lua ALL
@@ -98,21 +74,21 @@ if(HAVE_LUA)
     COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_BINARY_DIR}/lib/libsimgrid.${LIB_EXE} ${CMAKE_BINARY_DIR}/examples/simdag/simgrid.${LIB_EXE} #for test
     )
   SET(SIMGRID_DEP "${SIMGRID_DEP} -l${LIB_LUA_NAME}")
-endif(HAVE_LUA)
+endif()
 
 if(HAVE_GRAPHVIZ)
   if(HAVE_CGRAPH_LIB)
     SET(SIMGRID_DEP "${SIMGRID_DEP} -lcgraph")
-  else(HAVE_CGRAPH_LIB)
+  else()
     if(HAVE_AGRAPH_LIB)
       SET(SIMGRID_DEP "${SIMGRID_DEP} -lagraph -lcdt")
-    endif(HAVE_AGRAPH_LIB)
-  endif(HAVE_CGRAPH_LIB)
-endif(HAVE_GRAPHVIZ)
+    endif()
+  endif()
+endif()
 
 if(HAVE_GTNETS)
   SET(SIMGRID_DEP "${SIMGRID_DEP} -lgtnets")
-endif(HAVE_GTNETS)
+endif()
 
 if(HAVE_MC)
   # The availability of libunwind was checked in CompleteInFiles.cmake
@@ -122,36 +98,40 @@ if(HAVE_MC)
   # 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(PROCESSOR_x86_64)    
+  else()    
     SET(SIMGRID_DEP "${SIMGRID_DEP} -lunwind-x86")
-  endif(PROCESSOR_x86_64)
-endif(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")
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_NS3_3_10")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_NS3_3_10")
-  else(${NS3_VERSION} EQUAL 310)
+  else()
     SET(SIMGRID_DEP "${SIMGRID_DEP} -lns3-core -lns3-csma -lns3-point-to-point -lns3-internet -lns3-applications")
-  endif(${NS3_VERSION} EQUAL 310)
-endif(HAVE_NS3)
+  endif()
+endif()
 
 if(HAVE_POSIX_GETTIME)
   SET(SIMGRID_DEP "${SIMGRID_DEP} -lrt")
-endif(HAVE_POSIX_GETTIME)
+endif()
 
 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")
-endif(APPLE)
+  set(SMPI_DEP "-Wl,-U -Wl,_smpi_simulated_main")
+endif()
 if(enable_smpi)
-  target_link_libraries(smpi   simgrid ${SMPI_LDEP})
-endif(enable_smpi)
+  target_link_libraries(smpi   simgrid ${SMPI_DEP})
+endif()
 
 # Pass dependencies to static libs
 ##################################
@@ -160,13 +140,13 @@ 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(enable_smpi)
-endif(enable_lib_static)
+  endif()
+endif()
 
 # Dependencies from maintainer mode
 ###################################
 if(enable_maintainer_mode AND BISON_EXE AND LEX_EXE)
   add_dependencies(simgrid automaton_generated_src)
-endif(enable_maintainer_mode AND BISON_EXE AND LEX_EXE)
+endif()