X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/877648b703d2d392f50af134b9dc40c6753d3d54..c16407d4a40521a5adcb36356f356e2fb2161409:/buildtools/Cmake/MakeLib.cmake

diff --git a/buildtools/Cmake/MakeLib.cmake b/buildtools/Cmake/MakeLib.cmake
index bbf9eab654..d28e29d14b 100644
--- a/buildtools/Cmake/MakeLib.cmake
+++ b/buildtools/Cmake/MakeLib.cmake
@@ -12,29 +12,53 @@ if(enable_lib_static)
   add_library(simgrid_static STATIC ${simgrid_sources})
 endif()
 
+if(enable_ust)
+  ADD_DEPENDENCIES(simgrid simgrid_ust)
+endif()
+
 if(enable_java)
   include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/MakeJava.cmake)
 endif()
 
 add_dependencies(simgrid maintainer_files)
 
+if(enable_model-checking)
+  add_executable(simgrid-mc ${MC_SIMGRID_MC_SRC})
+  target_link_libraries(simgrid-mc simgrid)
+  set_target_properties(simgrid-mc
+    PROPERTIES
+      RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+endif()
+
 # Compute the dependencies of SimGrid
 #####################################
 set(SIMGRID_DEP "-lm")
+set(SIMGRID_DEP "${SIMGRID_DEP} ${Boost_CONTEXT_LIBRARY}")
 
 if(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD"
     AND NOT ${CMAKE_SYSTEM_VERSION} VERSION_LESS 10.0
     AND ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
   # FreeBSD from 10.0 provide a internal C++ stack (unused by gcc)
+  # see https://wiki.freebsd.org/NewC%2B%2BStack
   set(SIMGRID_DEP "${SIMGRID_DEP} -lc++")
+elseif(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD"
+    AND ${CMAKE_SYSTEM_VERSION} VERSION_LESS 10.0
+    AND ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
+  # FreeBSD prior to 10.0 does not necessarily have a compiler
+  # installed that is capable of c++11! Hence, we just assume
+  # here that libc++ was compiled.
+  # FIXME: We should change this behavior; we may want to include
+  # an option of whether libc++ (clang++) or libstdc++ (g++)
+  # should be used.
+  include_directories( "/usr/local/include/c++/v1")
+  set(SIMGRID_DEP "${SIMGRID_DEP} -lc++ -L/usr/local/lib ")
 else()
   set(SIMGRID_DEP "${SIMGRID_DEP} -lstdc++")
 endif()
 
-if(pthread)
-  if(${CONTEXT_THREADS})
-    SET(SIMGRID_DEP "${SIMGRID_DEP} -pthread")
-  endif()
+if(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()
 
 if(HAVE_LUA)
@@ -74,23 +98,30 @@ if(HAVE_GRAPHVIZ)
 endif()
 
 if(HAVE_LIBSIGC++)
-  SET(SIMGRID_DEP "${SIMGRID_DEP} -lsigc-2.0")	  
+  SET(SIMGRID_DEP "${SIMGRID_DEP} -lsigc-2.0")
 endif()
 
 if(HAVE_GTNETS)
   SET(SIMGRID_DEP "${SIMGRID_DEP} -lgtnets")
 endif()
 
+if(enable_mc_content_adressable_pages)
+  SET(SIMGRID_DEP "${SIMGRID_DEP} -lnettle")
+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")
+
+  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()    
+  else()
     SET(SIMGRID_DEP "${SIMGRID_DEP} -lunwind-x86")
   endif()
 endif()
@@ -117,6 +148,12 @@ if(HAVE_BACKTRACE_IN_LIBEXECINFO)
   SET(SIMGRID_DEP "${SIMGRID_DEP} -lexecinfo")
 endif(HAVE_BACKTRACE_IN_LIBEXECINFO)
 
+# Dependencies from USR
+###################################
+if(enable_ust)
+  set(SIMGRID_DEP "${SIMGRID_DEP} -llttng-ust")
+endif()
+
 # Compute the dependencies of SMPI
 ##################################
 if(enable_smpi AND APPLE)