X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bc48db087894fd960073b3120cebf90e6b2f8c02..bace8e5a6ff160e200f799250796c5303dc487ba:/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index c22fc86ed1..00ebaf2ef0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -110,12 +110,6 @@ else() endif() set(SIMGRID_VERSION_STRING "SimGrid version ${release_version}${SIMGRID_VERSION_EXTRA}") -set(SIMGRID_VERSION_BANNER "SIMGRID_VERSION_STRING\\nCopyright (c) 2004-${SIMGRID_VERSION_DATE}. The Simgrid Team.") -if(release) - set(SIMGRID_VERSION_BANNER "${SIMGRID_VERSION_BANNER}\\nRelease build") -else() - set(SIMGRID_VERSION_BANNER "${SIMGRID_VERSION_BANNER}\\nDevelopment build") -endif() set(libsimgrid_version "${release_version}") set(libsimgrid-java_version "${release_version}") @@ -245,7 +239,8 @@ else() else() message(FATAL_ERROR "Failed to find Boost libraries." "Did you install libboost-dev and libboost-context-dev?" - "(libboost-context-dev is optional)") + "(libboost-context-dev is optional)" + "SimGrid requires Boost >= 1.48.0") endif() endif() @@ -268,6 +263,18 @@ else() set(HAVE_BOOST_CONTEXTS 0) endif() +# Try again to see if we have libboost-context +find_package(Boost 1.42 COMPONENTS context) +set(Boost_FOUND 1) # We don't care of whether this component is missing + +if(Boost_FOUND AND Boost_GRAPH_FOUND) + set(HAVE_BOOST_GRAPH 1) +else() + message (" boost : found.") + message (" boost-graph : missing. Install libboost-graph-dev for this optional feature.") + set(HAVE_BOOST_GRAPH 0) +endif() + # Checks for header libraries functions. CHECK_LIBRARY_EXISTS(execinfo backtrace "" HAVE_BACKTRACE_IN_LIBEXECINFO) CHECK_LIBRARY_EXISTS(rt clock_gettime "" HAVE_POSIX_GETTIME) @@ -622,12 +629,6 @@ elseif(EXISTS ${CMAKE_HOME_DIRECTORY}/.gitversion) FILE(STRINGS ${CMAKE_HOME_DIRECTORY}/.gitversion GIT_VERSION) endif() -if(GIT_VERSION) - set(SIMGRID_VERSION_BANNER "${SIMGRID_VERSION_BANNER} at commit ${GIT_VERSION}") -endif() -if(GIT_DATE) - set(SIMGRID_VERSION_BANNER "${SIMGRID_VERSION_BANNER} (${GIT_DATE})") -endif() ### Generate the required headers and scripts #############################################