Skip to content

Commit 7ffc08b

Browse files
Bump versions of TBB, Expat and Lua installed via Conan (#6957)
1 parent feb9389 commit 7ffc08b

File tree

1 file changed

+3
-12
lines changed

1 file changed

+3
-12
lines changed

CMakeLists.txt

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -330,20 +330,12 @@ if(ENABLE_CONAN)
330330

331331
set(CONAN_BOOST_VERSION "1.85.0@#14265ec82b25d91305bbb3b30d3357f8")
332332
set(CONAN_BZIP2_VERSION "1.0.8@#d1b2d5816f25865acf978501dff1f897")
333-
set(CONAN_EXPAT_VERSION "2.2.10@#916908d4a570ad839edd25322c3268cd")
334-
set(CONAN_LUA_VERSION "5.4.4@#3ec62efc37cd0a5d80b9e5cb35277360")
335-
set(CONAN_TBB_VERSION "2021.3.0@#507ec17cbd51a84167e143b20d170eea")
333+
set(CONAN_EXPAT_VERSION "2.6.2@#2d385d0d50eb5561006a7ff9e356656b")
334+
set(CONAN_LUA_VERSION "5.4.6@#658d6089093cf01992c2737ab2e96763")
335+
set(CONAN_TBB_VERSION "2021.12.0@#e56e5b44be8d690530585dd3634c0106")
336336

337337
set(CONAN_SYSTEM_INCLUDES ON)
338338

339-
# TODO:
340-
# if we link TBB dynamically osrm-extract.exe finishes on the first access to any TBB symbol
341-
# with exit code = -1073741515, which means that program cannot load required DLL.
342-
if (MSVC)
343-
set(TBB_SHARED False)
344-
else()
345-
set(TBB_SHARED True)
346-
endif()
347339

348340
set(CONAN_ARGS
349341
REQUIRES
@@ -357,7 +349,6 @@ if(ENABLE_CONAN)
357349
KEEP_RPATHS
358350
NO_OUTPUT_DIRS
359351
OPTIONS boost:filesystem_version=3 # https://stackoverflow.com/questions/73392648/error-with-boost-filesystem-version-in-cmake
360-
onetbb:shared=${TBB_SHARED}
361352
boost:without_stacktrace=True # Apple Silicon cross-compilation fails without it
362353
BUILD missing
363354
)

0 commit comments

Comments
 (0)