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

wip

Browse Source
This commit is contained in:
Siarhei Fedartsou 2024-10-29 20:41:07 +01:00
parent 0c9b23f4ff
commit f48bfdf159
2 changed files with 17 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -166,7 +166,7 @@ jobs:
docker stop osrm-container docker stop osrm-container
build-test-publish: build-test-publish:
#needs: format-taginfo-docs needs: format-taginfo-docs
strategy: strategy:
matrix: matrix:
include: include:
@ -519,13 +519,12 @@ jobs:
echo "Using ${JOBS} jobs" echo "Using ${JOBS} jobs"
pushd ${OSRM_BUILD_DIR} pushd ${OSRM_BUILD_DIR}
python3 -m venv .venv if [[ "${ENABLE_CONAN}" == "ON" ]]; then
python3 -m venv .venv
source .venv/bin/activate source .venv/bin/activate
python3 -m pip install conan==2.7.1
python3 -m pip install conan==2.7.1 conan profile detect --force
fi
conan profile detect --force
ccache --zero-stats ccache --zero-stats
cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \ cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
@ -566,9 +565,11 @@ jobs:
run: | run: |
make -C test/data benchmark make -C test/data benchmark
# # macOS SIP strips the linker path. Reset this inside the running shell # macOS SIP strips the linker path. Reset this inside the running shell
# export LD_LIBRARY_PATH=${{ env.LD_LIBRARY_PATH }} if [[ "${ENABLE_CONAN}" == "OFF" ]]; then
# ./example/build/osrm-example test/data/mld/monaco.osrm export LD_LIBRARY_PATH=${{ env.LD_LIBRARY_PATH }}
./example/build/osrm-example test/data/mld/monaco.osrm
fi
# All tests assume to be run from the build directory # All tests assume to be run from the build directory
pushd ${OSRM_BUILD_DIR} pushd ${OSRM_BUILD_DIR}

18
CMakeLists.txt
View File

@ -652,19 +652,11 @@ list(APPEND DEPENDENCIES_INCLUDE_DIRS "${PKGCONFIG_INCLUDE_DIR}")
list(APPEND DEPENDENCIES_INCLUDE_DIRS "${PKGCONFIG_INCLUDE_DIR}/osrm") list(APPEND DEPENDENCIES_INCLUDE_DIRS "${PKGCONFIG_INCLUDE_DIR}/osrm")
JOIN("-I${DEPENDENCIES_INCLUDE_DIRS}" " -I" PKGCONFIG_OSRM_INCLUDE_FLAGS) JOIN("-I${DEPENDENCIES_INCLUDE_DIRS}" " -I" PKGCONFIG_OSRM_INCLUDE_FLAGS)
# # Boost uses imported targets, we need to use a generator expression to extract
# # the link libraries to be written to the pkg-config file. foreach(engine_lib ${ENGINE_LIBRARIES})
# # Conan & TBB define dependencies as CMake targets too, that's why we do the same for them. list(APPEND PKGCONFIG_DEPENDENT_LIBRARIES "${engine_lib}")
if (NOT ENABLE_CONAN) endforeach(engine_lib)
foreach(engine_lib ${ENGINE_LIBRARIES})
message(STATUS "Adding ${engine_lib} to pkg-config dependencies")
if("${engine_lib}" MATCHES "^boost.*" OR "${engine_lib}" MATCHES "^CONAN_LIB.*" OR "${engine_lib}" MATCHES "^TBB.*")
list(APPEND PKGCONFIG_DEPENDENT_LIBRARIES "$<TARGET_LINKER_FILE:${engine_lib}>")
else()
list(APPEND PKGCONFIG_DEPENDENT_LIBRARIES "${engine_lib}")
endif()
endforeach(engine_lib)
endif()
JOIN("${PKGCONFIG_DEPENDENT_LIBRARIES}" " " PKGCONFIG_OSRM_DEPENDENT_LIBRARIES) JOIN("${PKGCONFIG_DEPENDENT_LIBRARIES}" " " PKGCONFIG_OSRM_DEPENDENT_LIBRARIES)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/pkgconfig.in pkgconfig.configured @ONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/pkgconfig.in pkgconfig.configured @ONLY)