natas_hw
/
openvino
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Conan: compilation with dynamic flatbuffers (#19238)

This commit is contained in:
Ilya Lavrenov 2023-08-17 11:36:30 +04:00 committed by GitHub
parent 3ef345095c
commit 14abb2de8e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cmake/install_tbb.cmake
View File

@ -99,7 +99,7 @@ if(THREADING MATCHES "^(TBB|TBB_AUTO)$" AND
if(CPACK_GENERATOR MATCHES "^(DEB|RPM|CONDA-FORGE|BREW|CONAN|VCPKG)$" AND
NOT ENABLE_SYSTEM_TBB AND
NOT _ov_system_tbb_is_obsolete)
message(FATAL_ERROR "Debian | RPM | Conda-forge | brew | vcpkg packages can be built only with system TBB. Use -DENABLE_SYSTEM_TBB=ON")
message(FATAL_ERROR "Debian | RPM | Conda-forge | brew | vcpkg | Conan packages can be built only with system TBB. Use -DENABLE_SYSTEM_TBB=ON")
endif()
if(ENABLE_SYSTEM_TBB)

8
thirdparty/dependencies.cmake vendored
View File

@ -485,7 +485,13 @@ if(ENABLE_OV_TF_LITE_FRONTEND)
if(Flatbuffers_FOUND)
# we don't actually use library files (.so | .dylib | .a) itself, only headers
set(flatbuffers_LIBRARY flatbuffers::flatbuffers)
if(TARGET flatbuffers::flatbuffers_shared)
set(flatbuffers_LIBRARY flatbuffers::flatbuffers_shared)
elseif(TARGET flatbuffers::flatbuffers)
set(flatbuffers_LIBRARY flatbuffers::flatbuffers)
else()
message(FATAL_ERROR "Internal error: Failed to detect flatbuffers library target")
endif()
set(flatbuffers_COMPILER flatbuffers::flatc)
else()
add_subdirectory(thirdparty/flatbuffers EXCLUDE_FROM_ALL)