From c315231784768167c71bd259ad98708b3f2e64cb Mon Sep 17 00:00:00 2001 From: Siarhei Fedartsou Date: Wed, 31 Aug 2022 09:59:53 +0200 Subject: [PATCH] Pin revisions of Conan dependencies (#6351) --- .github/workflows/osrm-backend.yml | 6 +++--- CMakeLists.txt | 22 +++++++++++----------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/osrm-backend.yml b/.github/workflows/osrm-backend.yml index d4b001450e1..3bb854e0900 100644 --- a/.github/workflows/osrm-backend.yml +++ b/.github/workflows/osrm-backend.yml @@ -475,9 +475,9 @@ jobs: uses: actions/cache@v2 with: path: ~/.conan - key: v3-conan-${{ matrix.name }}-${{ github.sha }} + key: v4-conan-${{ matrix.name }}-${{ github.sha }} restore-keys: | - v3-conan-${{ matrix.name }}- + v4-conan-${{ matrix.name }}- - name: Enable test cache uses: actions/cache@v2 with: @@ -516,7 +516,7 @@ jobs: - name: Install dev dependencies run: | - python3 -m pip install conan==1.50.0 + python3 -m pip install conan==1.51.3 # CMake mkdir -p ${CMAKE_DIR} diff --git a/CMakeLists.txt b/CMakeLists.txt index 6f093ddcfe2..46acc13d9b1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -459,11 +459,11 @@ if(ENABLE_CONAN) include(${CMAKE_CURRENT_LIST_DIR}/cmake/conan.cmake) - set(CONAN_BOOST_VERSION 1.79.0) - set(CONAN_BZIP2_VERSION 1.0.8) - set(CONAN_EXPAT_VERSION 2.2.10) - set(CONAN_LUA_VERSION 5.4.4) - set(CONAN_TBB_VERSION 2021.3.0) + set(CONAN_BOOST_VERSION "1.79.0#96e4902111a2e343a8ba0aa95391bb58") + set(CONAN_BZIP2_VERSION "1.0.8#d1b2d5816f25865acf978501dff1f897") + set(CONAN_EXPAT_VERSION "2.2.10#916908d4a570ad839edd25322c3268cd") + set(CONAN_LUA_VERSION "5.4.4#3ec62efc37cd0a5d80b9e5cb35277360") + set(CONAN_TBB_VERSION "2021.3.0#507ec17cbd51a84167e143b20d170eea") set(CONAN_SYSTEM_INCLUDES ON) @@ -478,11 +478,11 @@ if(ENABLE_CONAN) set(CONAN_ARGS REQUIRES - boost/${CONAN_BOOST_VERSION} - bzip2/${CONAN_BZIP2_VERSION} - expat/${CONAN_EXPAT_VERSION} - lua/${CONAN_LUA_VERSION} - onetbb/${CONAN_TBB_VERSION} + "boost/${CONAN_BOOST_VERSION}" + "bzip2/${CONAN_BZIP2_VERSION}" + "expat/${CONAN_EXPAT_VERSION}" + "lua/${CONAN_LUA_VERSION}" + "onetbb/${CONAN_TBB_VERSION}" BASIC_SETUP GENERATORS cmake_find_package KEEP_RPATHS @@ -505,7 +505,7 @@ if(ENABLE_CONAN) add_dependency_includes(${CONAN_INCLUDE_DIRS_TBB}) set(Boost_USE_STATIC_LIBS ON) - find_package(Boost REQUIRED EXACT ${CONAN_BOOST_VERSION} COMPONENTS ${BOOST_COMPONENTS}) + find_package(Boost REQUIRED COMPONENTS ${BOOST_COMPONENTS}) set(Boost_DATE_TIME_LIBRARY "${Boost_date_time_LIB_TARGETS}") set(Boost_CHRONO_LIBRARY "${Boost_chrono_LIB_TARGETS}") set(Boost_PROGRAM_OPTIONS_LIBRARY "${Boost_program_options_LIB_TARGETS}")