From fcf42b84354f41be1c1943df9c746c3713fd1866 Mon Sep 17 00:00:00 2001 From: Nils Nolde Date: Mon, 3 Oct 2022 22:39:54 +0200 Subject: [PATCH] conanbuildinfo.json for easy reading of dependencies --- CHANGELOG.md | 1 + CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b6ec2d73e..c28f7f644 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - NodeJS: - FIXED: Support `skip_waypoints` in Node bindings [#6060](https://github.com/Project-OSRM/osrm-backend/pull/6060) - Misc: + - ADDED: conanbuildinfo.json for easy reading of dependencies [#6388](https://github.com/Project-OSRM/osrm-backend/pull/6388) - CHANGED: Optimize RestrictionParser performance. [#6344](https://github.com/Project-OSRM/osrm-backend/pull/6344) - ADDED: Support floats for speed value in traffic updates CSV. [#6327](https://github.com/Project-OSRM/osrm-backend/pull/6327) - CHANGED: Use Lua 5.4 in Docker image. [#6346](https://github.com/Project-OSRM/osrm-backend/pull/6346) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3f0630b99..5ed04dc40 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -494,7 +494,7 @@ if(ENABLE_CONAN) "lua/${CONAN_LUA_VERSION}" "onetbb/${CONAN_TBB_VERSION}" BASIC_SETUP - GENERATORS cmake_find_package + GENERATORS cmake_find_package json KEEP_RPATHS NO_OUTPUT_DIRS OPTIONS boost:filesystem_version=3 # https://stackoverflow.com/questions/73392648/error-with-boost-filesystem-version-in-cmake