Skip to content

Commit bb18a2b

Browse files
Fix TBB in case of Conan + NodeJS build (#6333)
1 parent c204360 commit bb18a2b

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
- 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)
1919
- FIXED: Internal refactoring of identifier types used in data facade [#6044](https://github.com/Project-OSRM/osrm-backend/pull/6044)
2020
- Build:
21+
- CHANGED: Fix TBB in case of Conan + NodeJS build. [#6333](https://github.com/Project-OSRM/osrm-backend/pull/6333)
2122
- CHANGED: Migrate to modern TBB version. [#6300](https://github.com/Project-OSRM/osrm-backend/pull/6300)
2223
- CHANGED: Enable performance-move-const-arg clang-tidy check. [#6319](https://github.com/Project-OSRM/osrm-backend/pull/6319)
2324
- CHANGED: Use the latest node on CI. [#6317](https://github.com/Project-OSRM/osrm-backend/pull/6317)

src/nodejs/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ endforeach(binary)
3333

3434
# For mason-enabled builds we copy over tbb's shared objects for packaging.
3535
# TODO: consider using statically linked tbb library (for node_osrm only!)
36-
if (ENABLE_MASON)
37-
foreach(libpath ${MASON_PACKAGE_tbb_LIBRARY_DIRS})
36+
if (ENABLE_CONAN)
37+
foreach(libpath ${CONAN_LIB_DIRS_ONETBB})
3838
file(GLOB TBBGlob ${libpath}/*.*)
3939
foreach(filepath ${TBBGlob})
4040
get_filename_component(filename ${filepath} NAME)

0 commit comments

Comments
 (0)