mirror of
git://git.yoctoproject.org/meta-intel.git
synced 2025-07-19 21:09:03 +02:00
7515d740e6
* Refresh patches. * Drop Protobuf change which disabled use of static protobuf libs from system. This is not needed anymore as we are now building Protobuf as bundled dependency. Release Notes: https://github.com/openvinotoolkit/openvino/releases/tag/2023.0.1 Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com> Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
65 lines
2.2 KiB
Diff
65 lines
2.2 KiB
Diff
Yocto specific tweaks to the build process:
|
|
|
|
* Dont try to detect glibc version as that doesn't work when cross compiling.
|
|
* Use shared protobuf and gflags libs.
|
|
* Install sample binaries as well.
|
|
|
|
Upstream-Status: Inappropriate
|
|
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
|
|
---
|
|
cmake/developer_package/target_flags.cmake | 2 +-
|
|
samples/cpp/CMakeLists.txt | 6 +++---
|
|
thirdparty/CMakeLists.txt | 8 ++++----
|
|
3 files changed, 8 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/cmake/developer_package/target_flags.cmake b/cmake/developer_package/target_flags.cmake
|
|
index ced8d519da3..505c1fa5b14 100644
|
|
--- a/cmake/developer_package/target_flags.cmake
|
|
+++ b/cmake/developer_package/target_flags.cmake
|
|
@@ -145,4 +145,4 @@ function(ov_glibc_version)
|
|
endif()
|
|
endfunction()
|
|
|
|
-ov_glibc_version()
|
|
+#ov_glibc_version()
|
|
diff --git a/samples/cpp/CMakeLists.txt b/samples/cpp/CMakeLists.txt
|
|
index 37eb0250112..35ec6a3368a 100644
|
|
--- a/samples/cpp/CMakeLists.txt
|
|
+++ b/samples/cpp/CMakeLists.txt
|
|
@@ -219,9 +219,9 @@ macro(ie_add_sample)
|
|
target_link_libraries(${IE_SAMPLE_NAME} PRIVATE ${ov_link_libraries} Threads::Threads ${IE_SAMPLE_DEPENDENCIES})
|
|
|
|
install(TARGETS ${IE_SAMPLE_NAME}
|
|
- RUNTIME DESTINATION samples_bin/
|
|
- COMPONENT samples_bin
|
|
- EXCLUDE_FROM_ALL)
|
|
+ DESTINATION ${CMAKE_INSTALL_BINDIR}
|
|
+ COMPONENT samples_bin)
|
|
+
|
|
|
|
# create global target with all samples / demo apps
|
|
if(NOT TARGET ie_samples)
|
|
diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
|
|
index 95d80a6fbd4..963c9a5d60a 100644
|
|
--- a/thirdparty/CMakeLists.txt
|
|
+++ b/thirdparty/CMakeLists.txt
|
|
@@ -353,11 +353,11 @@ endif()
|
|
if(ENABLE_SAMPLES OR ENABLE_COMPILE_TOOL OR ENABLE_TESTS)
|
|
# on Windows and macOS we don't use gflags, because will be dynamically linked
|
|
if(CMAKE_HOST_LINUX AND LINUX)
|
|
- if(OV_OS_RHEL)
|
|
+ #if(OV_OS_RHEL)
|
|
set(gflag_component nothreads_shared)
|
|
- elseif(OV_OS_DEBIAN)
|
|
- set(gflag_component nothreads_static)
|
|
- endif()
|
|
+ #elseif(OV_OS_DEBIAN)
|
|
+ #set(gflag_component nothreads_static)
|
|
+ #endif()
|
|
find_package(gflags QUIET OPTIONAL_COMPONENTS ${gflag_component})
|
|
else()
|
|
# conan case
|
|
--
|
|
2.34.1
|
|
|