wip
This commit is contained in:
@@ -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
|
||||
|
||||
|
||||
+1
-1
@@ -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)
|
||||
|
||||
@@ -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"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user