Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Migrate to Conan 2.x

Browse Source
This commit is contained in:
Siarhei Fedartsou 2024-09-30 19:55:21 +03:00
parent 8871c9054b
commit ac89b85a33
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.github/workflows/osrm-backend.yml vendored
View File

@ -63,8 +63,10 @@ jobs:
conan install .. --output-folder=. --build=missing --settings compiler.cppstd=20 conan install .. --output-folder=. --build=missing --settings compiler.cppstd=20
fi fi
cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_CONAN=ON -DENABLE_NODE_BINDINGS=ON -DCMAKE_TOOLCHAIN_FILE=./conan_toolchain.cmake .. ls -la
cmake --build . --config Release
# 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 # # TODO: MSVC goes out of memory when building our tests
# # - name: Run tests # # - name: Run tests
@ -538,7 +540,7 @@ jobs:
# sed -i '' 's/compiler.cppstd=.*$/compiler.cppstd=20/' ~/.conan/profiles/default # sed -i '' 's/compiler.cppstd=.*$/compiler.cppstd=20/' ~/.conan/profiles/default
if [[ "${ENABLE_CONAN}" == "ON" ]]; then 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 --settings build_type=Debug
fi fi
ccache --zero-stats ccache --zero-stats

4
conanfile.py
View File

@ -11,6 +11,10 @@ class OsrmConan(ConanFile):
"onetbb/2021.12.0", "onetbb/2021.12.0",
) )
generators = "CMakeDeps" generators = "CMakeDeps"
def requirements(self):
self.options["boost"].without_python = True
self.options["boost"].without_coroutine = True
def generate(self): def generate(self):
tc = CMakeToolchain(self) tc = CMakeToolchain(self)

1
unit_tests/util/io.cpp
View File

@ -17,7 +17,6 @@ const static std::string IO_TOO_SMALL_FILE = "file_too_small_test_io.tmp";
const static std::string IO_CORRUPT_FINGERPRINT_FILE = "corrupt_fingerprint_file_test_io.tmp"; const static std::string IO_CORRUPT_FINGERPRINT_FILE = "corrupt_fingerprint_file_test_io.tmp";
const static std::string IO_INCOMPATIBLE_FINGERPRINT_FILE = const static std::string IO_INCOMPATIBLE_FINGERPRINT_FILE =
"incompatible_fingerprint_file_test_io.tmp"; "incompatible_fingerprint_file_test_io.tmp";
const static std::string IO_TEXT_FILE = "plain_text_file.tmp";
using namespace osrm; using namespace osrm;