Migrate to Conan 2.x

This commit is contained in:
Siarhei Fedartsou 2024-09-30 20:02:50 +03:00
parent ac89b85a33
commit ab519aae79
2 changed files with 3 additions and 6 deletions

View File

@ -57,15 +57,12 @@ jobs:
python3 -m pip install conan==2.7.1 python3 -m pip install conan==2.7.1
conan profile detect --force conan profile detect --force
cat ~/.conan2/profiles/default
if [[ "${ENABLE_CONAN}" == "ON" ]]; then conan install .. --output-folder=. --build=missing --settings compiler.cppstd=20
conan install .. --output-folder=. --build=missing --settings compiler.cppstd=20
fi
ls -la 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 # cmake --build . --config Release
# # TODO: MSVC goes out of memory when building our tests # # TODO: MSVC goes out of memory when building our tests

View File

@ -12,7 +12,7 @@ class OsrmConan(ConanFile):
) )
generators = "CMakeDeps" generators = "CMakeDeps"
def requirements(self): def configure(self):
self.options["boost"].without_python = True self.options["boost"].without_python = True
self.options["boost"].without_coroutine = True self.options["boost"].without_coroutine = True