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-29 11:43:21 +02:00
parent 893c0d7d1d
commit a885dff707
2 changed files with 32 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -271,16 +271,16 @@ jobs:
# ENABLE_SANITIZER: ON # ENABLE_SANITIZER: ON
# ENABLE_LTO: OFF # ENABLE_LTO: OFF
# - name: conan-linux-release - name: conan-linux-release
# continue-on-error: false continue-on-error: false
# node: 18 node: 18
# runs-on: ubuntu-24.04 runs-on: ubuntu-24.04
# BUILD_TOOLS: ON BUILD_TOOLS: ON
# BUILD_TYPE: Release BUILD_TYPE: Release
# CCOMPILER: clang-18 CCOMPILER: clang-18
# CXXCOMPILER: clang++-18 CXXCOMPILER: clang++-18
# ENABLE_CONAN: ON ENABLE_CONAN: ON
# ENABLE_LTO: OFF ENABLE_LTO: OFF
# - name: gcc-14-release # - name: gcc-14-release
# continue-on-error: false # continue-on-error: false
@ -334,29 +334,29 @@ jobs:
ENABLE_CONAN: ON ENABLE_CONAN: ON
NODE_PACKAGE_TESTS_ONLY: ON NODE_PACKAGE_TESTS_ONLY: ON
# - name: conan-macos-x64-release-node - name: conan-macos-x64-release-node
# build_node_package: true build_node_package: true
# continue-on-error: true continue-on-error: true
# node: 20 node: 20
# runs-on: macos-13 # x86_64 runs-on: macos-13 # x86_64
# BUILD_TYPE: Release BUILD_TYPE: Release
# CCOMPILER: clang CCOMPILER: clang
# CXXCOMPILER: clang++ CXXCOMPILER: clang++
# CUCUMBER_TIMEOUT: 60000 CUCUMBER_TIMEOUT: 60000
# ENABLE_ASSERTIONS: ON ENABLE_ASSERTIONS: ON
# ENABLE_CONAN: ON ENABLE_CONAN: ON
# - name: conan-macos-arm64-release-node - name: conan-macos-arm64-release-node
# build_node_package: true build_node_package: true
# continue-on-error: true continue-on-error: true
# node: 20 node: 20
# runs-on: macos-14 # arm64 runs-on: macos-14 # arm64
# BUILD_TYPE: Release BUILD_TYPE: Release
# CCOMPILER: clang CCOMPILER: clang
# CXXCOMPILER: clang++ CXXCOMPILER: clang++
# CUCUMBER_TIMEOUT: 60000 CUCUMBER_TIMEOUT: 60000
# ENABLE_ASSERTIONS: ON ENABLE_ASSERTIONS: ON
# ENABLE_CONAN: ON ENABLE_CONAN: ON
name: ${{ matrix.name}} name: ${{ matrix.name}}
continue-on-error: ${{ matrix.continue-on-error }} continue-on-error: ${{ matrix.continue-on-error }}

5
unit_tests/CMakeLists.txt
View File

@ -126,11 +126,6 @@ add_executable(util-tests
${UtilTestsSources} ${UtilTestsSources}
$<TARGET_OBJECTS:UTIL> $<TARGET_OBJECTS:MICROTAR>) $<TARGET_OBJECTS:UTIL> $<TARGET_OBJECTS:MICROTAR>)
if(NOT WIN32 AND NOT Boost_USE_STATIC_LIBS)
add_definitions(-DBOOST_TEST_DYN_LINK)
endif()
set(UPDATER_TEST_DATA_DIR "${CMAKE_SOURCE_DIR}/unit_tests/updater") set(UPDATER_TEST_DATA_DIR "${CMAKE_SOURCE_DIR}/unit_tests/updater")
set(TEST_DATA_DIR "${CMAKE_SOURCE_DIR}/test/data") set(TEST_DATA_DIR "${CMAKE_SOURCE_DIR}/test/data")
add_dependencies(library-tests osrm-extract osrm-contract osrm-partition) add_dependencies(library-tests osrm-extract osrm-contract osrm-partition)