X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/185e5aa83f3cc2e8e99acc3e040aac6750a7c2e9..d27569cf3d838674e1325b58e2b9184b5b700bf5:/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 4857bd4a0d..6a9c7c138a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -90,8 +90,8 @@ endif() set(SIMGRID_VERSION_MAJOR "3") set(SIMGRID_VERSION_MINOR "13") -set(SIMGRID_VERSION_PATCH "90") -set(SIMGRID_VERSION_EXTRA "-prealpha") # Extra words to add to version string (e.g. -rc1) +set(SIMGRID_VERSION_PATCH "91") +set(SIMGRID_VERSION_EXTRA "-alpha") # Extra words to add to version string (e.g. -rc1) set(SIMGRID_VERSION_DATE "2016") # Year for copyright information @@ -230,17 +230,23 @@ if(enable_smpi_papi) endif() endif() +# Not finding this is perfectly OK +find_package(Boost COMPONENTS unit_test_framework) +if (Boost_UNIT_TEST_FRAMEWORK_FOUND) + message("-- (enabling the Boost-based unit tests)") +else() + message("-- (disabling the Boost-based unit tests -- please install libboost-test-dev)") +endif() + + find_package(Boost 1.48) if(Boost_FOUND) include_directories(${Boost_INCLUDE_DIRS}) else() if(APPLE) - message(FATAL_ERROR "Failed to find Boost libraries (Try to install them with 'sudo fink install boost1.53.nopython')") + message(FATAL_ERROR "Boost libraries not found. Try to install them with 'sudo fink install boost1.53.nopython'") else() - message(FATAL_ERROR "Failed to find Boost libraries." - "Did you install libboost-dev and libboost-context-dev?" - "(libboost-context-dev is optional)" - "SimGrid requires Boost >= 1.48.0") + message(FATAL_ERROR "Boost libraries not found. Install libboost-dev (>= 1.48.0).") endif() endif() @@ -249,7 +255,7 @@ endif() find_package(Boost 1.61 COMPONENTS context) if(Boost_FOUND AND Boost_CONTEXT_FOUND) - message("WARNING : our implementation of Boost context factory is not compatible with Boost >=1.61 yet.") + message(" WARNING : our implementation of Boost context factory is not compatible with Boost >=1.61 yet.") set(Boost_FOUND 1) set(HAVE_BOOST_CONTEXTS 0)