From b6e83f7f610b99f7c65600a8b7445b5bf7940bc9 Mon Sep 17 00:00:00 2001 From: Siarhei Fedartsou Date: Mon, 8 Aug 2022 21:19:33 +0200 Subject: [PATCH 1/2] Remove EXACT from find_package if using Conan --- CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d5318344ebc..32c7a5735c5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -495,12 +495,12 @@ if(ENABLE_CONAN) set(Boost_REGEX_LIBRARY "${Boost_regex_LIB_TARGETS}") set(Boost_UNIT_TEST_FRAMEWORK_LIBRARY "${Boost_unit_test_framework_LIB_TARGETS}") - find_package(BZip2 REQUIRED EXACT ${CONAN_BZIP2_VERSION}) - find_package(EXPAT REQUIRED EXACT ${CONAN_EXPAT_VERSION}) - find_package(lua REQUIRED EXACT ${CONAN_LUA_VERSION}) + find_package(BZip2 REQUIRED) + find_package(EXPAT REQUIRED) + find_package(lua REQUIRED) set(LUA_LIBRARIES ${lua_LIBRARIES}) - find_package(TBB REQUIRED EXACT ${CONAN_TBB_VERSION}) + find_package(TBB REQUIRED) # note: we avoid calling find_package(Osmium ...) here to ensure that the From be5e0ef8a5fbd5d60633bd9f0fbc477db5be2a0e Mon Sep 17 00:00:00 2001 From: Siarhei Fedartsou Date: Mon, 8 Aug 2022 21:25:40 +0200 Subject: [PATCH 2/2] Remove EXACT from find_package if using Conan --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2347d2102a8..67d491d60d2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - Misc: - FIXED: Fix bug with reading Set values from Lua scripts. [#6285](https://github.com/Project-OSRM/osrm-backend/pull/6285) - Build: + - CHANGED: Remove EXACT from find_package if using Conan. [#6299](https://github.com/Project-OSRM/osrm-backend/pull/6299) - CHANGED: Configure Undefined Behaviour Sanitizer. [#6290](https://github.com/Project-OSRM/osrm-backend/pull/6290) - CHANGED: Use Conan instead of Mason to install code dependencies. [#6284](https://github.com/Project-OSRM/osrm-backend/pull/6284) - CHANGED: Migrate to C++17. Update sol2 to 3.3.0. [#6279](https://github.com/Project-OSRM/osrm-backend/pull/6279)