Skip to content

Commit ab519aa

Browse files
Migrate to Conan 2.x
1 parent ac89b85 commit ab519aa

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

.github/workflows/osrm-backend.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,15 +57,12 @@ jobs:
5757
python3 -m pip install conan==2.7.1
5858
5959
conan profile detect --force
60-
cat ~/.conan2/profiles/default
6160
62-
if [[ "${ENABLE_CONAN}" == "ON" ]]; then
63-
conan install .. --output-folder=. --build=missing --settings compiler.cppstd=20
64-
fi
61+
conan install .. --output-folder=. --build=missing --settings compiler.cppstd=20
6562
6663
ls -la
6764
68-
# cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_CONAN=ON -DENABLE_NODE_BINDINGS=ON -DCMAKE_TOOLCHAIN_FILE=./conan_toolchain.cmake ..
65+
cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_CONAN=ON -DENABLE_NODE_BINDINGS=ON -DCMAKE_TOOLCHAIN_FILE=./conan_toolchain.cmake ..
6966
# cmake --build . --config Release
7067
7168
# # TODO: MSVC goes out of memory when building our tests

conanfile.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class OsrmConan(ConanFile):
1212
)
1313
generators = "CMakeDeps"
1414

15-
def requirements(self):
15+
def configure(self):
1616
self.options["boost"].without_python = True
1717
self.options["boost"].without_coroutine = True
1818

0 commit comments

Comments
 (0)