X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6c12a132ca10eefd1d566e489e837e459db4d979..37d25ed3970468deb7dc8e6003226fceadc46b5a:/buildtools/Cmake/MakeLib.cmake

diff --git a/buildtools/Cmake/MakeLib.cmake b/buildtools/Cmake/MakeLib.cmake
index 91611c92c0..fc2aa83844 100644
--- a/buildtools/Cmake/MakeLib.cmake
+++ b/buildtools/Cmake/MakeLib.cmake
@@ -33,12 +33,25 @@ 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()
@@ -86,7 +99,7 @@ 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)
@@ -100,7 +113,7 @@ 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
@@ -109,7 +122,7 @@ 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()    
+  else()
     SET(SIMGRID_DEP "${SIMGRID_DEP} -lunwind-x86")
   endif()
 endif()