From ab519aae79590dc972ebab8a20344401369cda4c Mon Sep 17 00:00:00 2001 From: Siarhei Fedartsou Date: Mon, 30 Sep 2024 20:02:50 +0300 Subject: [PATCH] Migrate to Conan 2.x --- .github/workflows/osrm-backend.yml | 7 ++----- conanfile.py | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/osrm-backend.yml b/.github/workflows/osrm-backend.yml index a6c44346d..68123cfd9 100644 --- a/.github/workflows/osrm-backend.yml +++ b/.github/workflows/osrm-backend.yml @@ -57,15 +57,12 @@ jobs: python3 -m pip install conan==2.7.1 conan profile detect --force - cat ~/.conan2/profiles/default - if [[ "${ENABLE_CONAN}" == "ON" ]]; then - conan install .. --output-folder=. --build=missing --settings compiler.cppstd=20 - fi + conan install .. --output-folder=. --build=missing --settings compiler.cppstd=20 ls -la - # cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_CONAN=ON -DENABLE_NODE_BINDINGS=ON -DCMAKE_TOOLCHAIN_FILE=./conan_toolchain.cmake .. + cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_CONAN=ON -DENABLE_NODE_BINDINGS=ON -DCMAKE_TOOLCHAIN_FILE=./conan_toolchain.cmake .. # cmake --build . --config Release # # TODO: MSVC goes out of memory when building our tests diff --git a/conanfile.py b/conanfile.py index fb5351d50..bd6974634 100644 --- a/conanfile.py +++ b/conanfile.py @@ -12,7 +12,7 @@ class OsrmConan(ConanFile): ) generators = "CMakeDeps" - def requirements(self): + def configure(self): self.options["boost"].without_python = True self.options["boost"].without_coroutine = True