Skip to content

Commit ac89b85

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

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

.github/workflows/osrm-backend.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,10 @@ jobs:
6363
conan install .. --output-folder=. --build=missing --settings compiler.cppstd=20
6464
fi
6565
66-
cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_CONAN=ON -DENABLE_NODE_BINDINGS=ON -DCMAKE_TOOLCHAIN_FILE=./conan_toolchain.cmake ..
67-
cmake --build . --config Release
66+
ls -la
67+
68+
# cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_CONAN=ON -DENABLE_NODE_BINDINGS=ON -DCMAKE_TOOLCHAIN_FILE=./conan_toolchain.cmake ..
69+
# cmake --build . --config Release
6870
6971
# # TODO: MSVC goes out of memory when building our tests
7072
# # - name: Run tests
@@ -538,7 +540,7 @@ jobs:
538540
# sed -i '' 's/compiler.cppstd=.*$/compiler.cppstd=20/' ~/.conan/profiles/default
539541
540542
if [[ "${ENABLE_CONAN}" == "ON" ]]; then
541-
conan install .. --output-folder=. --build=missing --settings compiler.cppstd=20
543+
conan install .. --output-folder=. --build=missing --settings compiler.cppstd=20 --settings build_type=Debug
542544
fi
543545
544546
ccache --zero-stats

conanfile.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ class OsrmConan(ConanFile):
1111
"onetbb/2021.12.0",
1212
)
1313
generators = "CMakeDeps"
14+
15+
def requirements(self):
16+
self.options["boost"].without_python = True
17+
self.options["boost"].without_coroutine = True
1418

1519
def generate(self):
1620
tc = CMakeToolchain(self)

unit_tests/util/io.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ const static std::string IO_TOO_SMALL_FILE = "file_too_small_test_io.tmp";
1717
const static std::string IO_CORRUPT_FINGERPRINT_FILE = "corrupt_fingerprint_file_test_io.tmp";
1818
const static std::string IO_INCOMPATIBLE_FINGERPRINT_FILE =
1919
"incompatible_fingerprint_file_test_io.tmp";
20-
const static std::string IO_TEXT_FILE = "plain_text_file.tmp";
2120

2221
using namespace osrm;
2322

0 commit comments

Comments
 (0)