X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/de111d672f9520069004c03d5677986db430d8a2..781a388a7f1e57399562aa756e2d426bb009b4a4:/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 28cb796ab8..2ed6e4c933 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -288,11 +288,12 @@ set(_Boost_STACKTRACE_ADDR2LINE_HEADERS "boost/stacktrace.hpp")
     if(APPLE)
       message(FATAL_ERROR "Boost libraries not found. Try to install them with 'sudo fink install boost1.53.nopython' (check the exact name with 'fink list boost') or 'sudo brew install boost'")
     else()
-      if (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} LESS 3.11)
-        find_package(Boost 1.48) #try again with just boost, as old cmake may fail.
-      endif()
+      find_package(Boost 1.48) #try without optional libraries
       if(NOT Boost_FOUND)
         message(FATAL_ERROR "Boost libraries not found. Install libboost-dev (>= 1.48.0).")
+      else()
+        include_directories(${Boost_INCLUDE_DIRS})
+        message(STATUS "Mandatory components found. SimGrid is compilable.")
       endif()
     endif()
   endif() 
@@ -542,7 +543,7 @@ set(CMAKE_SMPI_COMMAND "export LD_LIBRARY_PATH=\"${CMAKE_INSTALL_PREFIX}/lib")
 if(NS3_LIBRARY_PATH)
   set(CMAKE_SMPI_COMMAND "${CMAKE_SMPI_COMMAND}:${NS3_LIBRARY_PATH}")
 endif()
-set(CMAKE_SMPI_COMMAND "${CMAKE_SMPI_COMMAND}:\${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}\"")
+set(CMAKE_SMPI_COMMAND "${CMAKE_SMPI_COMMAND}\${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}\"")
 set(SMPIMAIN ${libdir}/simgrid/smpimain)
 set(SMPIREPLAYMAIN ${libdir}/simgrid/smpireplaymain)
 
@@ -571,7 +572,7 @@ set(CMAKE_SMPI_COMMAND "export LD_LIBRARY_PATH=\"${CMAKE_BINARY_DIR}/lib")
 if(NS3_LIBRARY_PATH)
   set(CMAKE_SMPI_COMMAND "${CMAKE_SMPI_COMMAND}:${NS3_LIBRARY_PATH}")
 endif()
-set(CMAKE_SMPI_COMMAND "${CMAKE_SMPI_COMMAND}:\${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}\"")
+set(CMAKE_SMPI_COMMAND "${CMAKE_SMPI_COMMAND}\${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}\"")
 set(SMPIMAIN ${CMAKE_BINARY_DIR}/lib/simgrid/smpimain)
 set(SMPIREPLAYMAIN ${CMAKE_BINARY_DIR}/lib/simgrid/smpireplaymain)