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

Fix TBB in case of Conan + NodeJS build (#6333)

Browse Source
This commit is contained in:
Siarhei Fedartsou 2022-08-26 17:09:52 +02:00 committed by GitHub
parent c204360aa0
commit bb18a2b428
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -18,6 +18,7 @@
- FIXED: Bug in bicycle profile that caused exceptions if there is a highway=bicycle in the data. [#6296](https://github.com/Project-OSRM/osrm-backend/pull/6296) - FIXED: Bug in bicycle profile that caused exceptions if there is a highway=bicycle in the data. [#6296](https://github.com/Project-OSRM/osrm-backend/pull/6296)
- FIXED: Internal refactoring of identifier types used in data facade [#6044](https://github.com/Project-OSRM/osrm-backend/pull/6044) - FIXED: Internal refactoring of identifier types used in data facade [#6044](https://github.com/Project-OSRM/osrm-backend/pull/6044)
- Build: - Build:
- CHANGED: Fix TBB in case of Conan + NodeJS build. [#6333](https://github.com/Project-OSRM/osrm-backend/pull/6333)
- CHANGED: Migrate to modern TBB version. [#6300](https://github.com/Project-OSRM/osrm-backend/pull/6300) - CHANGED: Migrate to modern TBB version. [#6300](https://github.com/Project-OSRM/osrm-backend/pull/6300)
- CHANGED: Enable performance-move-const-arg clang-tidy check. [#6319](https://github.com/Project-OSRM/osrm-backend/pull/6319) - CHANGED: Enable performance-move-const-arg clang-tidy check. [#6319](https://github.com/Project-OSRM/osrm-backend/pull/6319)
- CHANGED: Use the latest node on CI. [#6317](https://github.com/Project-OSRM/osrm-backend/pull/6317) - CHANGED: Use the latest node on CI. [#6317](https://github.com/Project-OSRM/osrm-backend/pull/6317)

4
src/nodejs/CMakeLists.txt
View File

@ -33,8 +33,8 @@ endforeach(binary)
# For mason-enabled builds we copy over tbb's shared objects for packaging. # For mason-enabled builds we copy over tbb's shared objects for packaging.
# TODO: consider using statically linked tbb library (for node_osrm only!) # TODO: consider using statically linked tbb library (for node_osrm only!)
if (ENABLE_MASON) if (ENABLE_CONAN)
foreach(libpath ${MASON_PACKAGE_tbb_LIBRARY_DIRS}) foreach(libpath ${CONAN_LIB_DIRS_ONETBB})
file(GLOB TBBGlob ${libpath}/*.*) file(GLOB TBBGlob ${libpath}/*.*)
foreach(filepath ${TBBGlob}) foreach(filepath ${TBBGlob})
get_filename_component(filename ${filepath} NAME) get_filename_component(filename ${filepath} NAME)