From: Augustin Degomme Date: Wed, 28 Aug 2019 09:57:30 +0000 (+0200) Subject: actually failsafe has to be applied in all cases. X-Git-Tag: v3.24~129 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/702edcf696db24661a6d5c09d1ee2bcf5243a860 actually failsafe has to be applied in all cases. Windows on travis has a 1.58 boost, so it was failing the first attempt, but a recent cmake so it was avoiding the second. --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 28cb796ab8..80759314a2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -288,9 +288,7 @@ 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).") endif()