From 14abb2de8e3488250093c0a94e2b08e8b5ac1e8f Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Thu, 17 Aug 2023 11:36:30 +0400 Subject: [PATCH] Conan: compilation with dynamic flatbuffers (#19238) --- src/cmake/install_tbb.cmake | 2 +- thirdparty/dependencies.cmake | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/cmake/install_tbb.cmake b/src/cmake/install_tbb.cmake index 863da44f596..47464848eea 100644 --- a/src/cmake/install_tbb.cmake +++ b/src/cmake/install_tbb.cmake @@ -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) diff --git a/thirdparty/dependencies.cmake b/thirdparty/dependencies.cmake index f2b33b04969..43e0ed671a9 100644 --- a/thirdparty/dependencies.cmake +++ b/thirdparty/dependencies.cmake @@ -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)