From 95c7832c3ec5c4f2d53ebe1ca7eccb579bfeedb6 Mon Sep 17 00:00:00 2001 From: Michael Krasnyk Date: Sat, 22 Jul 2017 19:16:32 -0400 Subject: [PATCH] Don't use STXXL library by default --- CHANGELOG.md | 4 ++++ CMakeLists.txt | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c673e728a..c3e8ba6e8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,10 @@ - Reorders arguments to `WayHandlers` functions to match `process_way()`. - Profiles must return a hash of profile functions. This makes it easier for profiles to include each other. +# 5.9.1 + - Infrastructure + - STXXL is not required by default + # 5.9.0 - Changes from 5.8: - Algorithm: diff --git a/CMakeLists.txt b/CMakeLists.txt index ff1918940..699f285b6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,7 +26,7 @@ option(BUILD_PACKAGE "Build OSRM package" OFF) option(ENABLE_ASSERTIONS "Use assertions in release mode" OFF) option(ENABLE_COVERAGE "Build with coverage instrumentalisation" OFF) option(ENABLE_SANITIZER "Use memory sanitizer for Debug build" OFF) -option(ENABLE_STXXL "Use STXXL library" ON) +option(ENABLE_STXXL "Use STXXL library" OFF) option(ENABLE_LTO "Use LTO if available" OFF) option(ENABLE_FUZZING "Fuzz testing using LLVM's libFuzzer" OFF) option(ENABLE_GOLD_LINKER "Use GNU gold linker if available" ON)