From 440c00064ed4ae0398c5caac6999e7e0562390c3 Mon Sep 17 00:00:00 2001 From: Siarhei Fedartsou Date: Mon, 15 Aug 2022 22:21:01 +0200 Subject: [PATCH] Remove EXACT from find_package if using Conan (#6299) * Remove EXACT from find_package if using Conan --- CHANGELOG.md | 1 + CMakeLists.txt | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d28e35b96..6276ced97 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - FIXED: Fix bug with reading Set values from Lua scripts. [#6285](https://github.com/Project-OSRM/osrm-backend/pull/6285) - FIXED: Bug in bicycle profile that caused exceptions if there is a highway=bicycle in the data. [#6296](https://github.com/Project-OSRM/osrm-backend/pull/6296) - 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) diff --git a/CMakeLists.txt b/CMakeLists.txt index d5318344e..32c7a5735 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