X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e4abd3f271729beeff499da36267bfb274dd1f6d..16d02f0b6e7a4d6823172138b6dce141dab14654:/buildtools/Cmake/MakeLib.cmake?ds=sidebyside

diff --git a/buildtools/Cmake/MakeLib.cmake b/buildtools/Cmake/MakeLib.cmake
index 92ebff7d6f..f7adde30bf 100644
--- a/buildtools/Cmake/MakeLib.cmake
+++ b/buildtools/Cmake/MakeLib.cmake
@@ -23,6 +23,10 @@ if(enable_smpi)
   endif()
 endif()
 
+if(enable_java)
+  include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/MakeJava.cmake)
+endif()
+
 add_dependencies(simgrid maintainer_files)
 
 # if supernovaeing, we need some depends to make sure that the source gets generated
@@ -103,6 +107,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")