From d5564cc12718794c035137e6f8ed14b41a4eaaa8 Mon Sep 17 00:00:00 2001 From: Siarhei Fedartsou Date: Sun, 20 Oct 2024 19:40:19 +0200 Subject: [PATCH] wip --- .github/workflows/osrm-backend.yml | 4 ---- CMakeLists.txt | 2 +- conanfile.py | 1 + 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/osrm-backend.yml b/.github/workflows/osrm-backend.yml index 6861be62be..d6036b06ad 100644 --- a/.github/workflows/osrm-backend.yml +++ b/.github/workflows/osrm-backend.yml @@ -58,10 +58,6 @@ jobs: conan profile detect --force - # conan install .. --output-folder=. --build=missing --settings compiler.cppstd=20 - - # ls -la - cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_CONAN=ON -DENABLE_NODE_BINDINGS=ON .. cmake --build . --config Release diff --git a/CMakeLists.txt b/CMakeLists.txt index b2bc4bc643..237d73e29e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -345,7 +345,7 @@ if (MSVC) add_definitions(-DBOOST_ALL_NO_LIB) endif() -# set(Boost_USE_STATIC_LIBS ON) +set(Boost_USE_STATIC_LIBS ON) find_package(Boost REQUIRED COMPONENTS ${BOOST_COMPONENTS}) find_package(TBB REQUIRED) find_package(EXPAT REQUIRED) diff --git a/conanfile.py b/conanfile.py index e653d74277..384a146cc2 100644 --- a/conanfile.py +++ b/conanfile.py @@ -9,6 +9,7 @@ class OsrmConan(ConanFile): "expat/2.6.2", "lua/5.4.6", "onetbb/2021.12.0", + "zlib/1.3.1" ) generators = "CMakeDeps"