mirror of
git://git.yoctoproject.org/meta-intel.git
synced 2025-07-19 12:59:03 +02:00
116 lines
4.7 KiB
Diff
116 lines
4.7 KiB
Diff
From d63d1a1291a2715b7d70ed88c4d764b22e6f2f4d Mon Sep 17 00:00:00 2001
|
|
From: Liwei Song <liwei.song@windriver.com>
|
|
Date: Fri, 22 May 2020 15:47:44 +0800
|
|
Subject: [PATCH] use meta-oe gflags
|
|
|
|
gflags is available in meta-oe, use this one instead of the thirdparty
|
|
one in open-model-zoo
|
|
|
|
Upstream-Status: Inappropriate [meta-intel specific]
|
|
|
|
Signed-off-by: Liwei Song <liwei.song@windriver.com>
|
|
---
|
|
CMakeLists.txt | 8 ++++----
|
|
multi_channel/common/CMakeLists.txt | 2 +-
|
|
multi_channel/face_detection_demo/CMakeLists.txt | 2 +-
|
|
multi_channel/human_pose_estimation_demo/CMakeLists.txt | 2 +-
|
|
multi_channel/object_detection_demo_yolov3/CMakeLists.txt | 2 +-
|
|
5 files changed, 8 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 40b549f..dfdbf93 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -89,12 +89,10 @@ if (${CMAKE_CXX_COMPILER_ID} STREQUAL GNU)
|
|
endif()
|
|
####################################
|
|
|
|
-set (GFLAGS_IS_SUBPROJECT TRUE)
|
|
+set (GFLAGS_IS_SUBPROJECT FALSE)
|
|
set (HAVE_SYS_STAT_H 1)
|
|
set (HAVE_INTTYPES_H 1)
|
|
|
|
-add_subdirectory(thirdparty/gflags)
|
|
-
|
|
if (${CMAKE_CXX_COMPILER_ID} STREQUAL GNU)
|
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
|
|
endif()
|
|
@@ -177,7 +175,7 @@ macro(ie_add_sample)
|
|
target_include_directories(${IE_SAMPLE_NAME} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../common")
|
|
|
|
target_link_libraries(${IE_SAMPLE_NAME} PRIVATE ${OpenCV_LIBRARIES} ${InferenceEngine_LIBRARIES}
|
|
- ${IE_SAMPLE_DEPENDENCIES} gflags)
|
|
+ ${IE_SAMPLE_DEPENDENCIES} ${GFLAGS_LIBRARIES})
|
|
|
|
if(UNIX)
|
|
target_link_libraries(${IE_SAMPLE_NAME} PRIVATE pthread)
|
|
@@ -198,11 +196,13 @@ endmacro()
|
|
# use this flag if you need to throw custom message in case if the IE package is not found.
|
|
if (IE_NOT_FOUND_MESSAGE)
|
|
find_package(InferenceEngine 2.0 QUIET)
|
|
+ find_package(gflags 2.2 QUIET)
|
|
if (NOT(InferenceEngine_FOUND))
|
|
message(FATAL_ERROR ${IE_NOT_FOUND_MESSAGE})
|
|
endif()
|
|
else()
|
|
find_package(InferenceEngine 2.0 REQUIRED)
|
|
+ find_package(gflags 2.2 REQUIRED)
|
|
endif()
|
|
|
|
find_package(ngraph REQUIRED)
|
|
diff --git a/multi_channel/common/CMakeLists.txt b/multi_channel/common/CMakeLists.txt
|
|
index d5e5d93..c33afbb 100644
|
|
--- a/multi_channel/common/CMakeLists.txt
|
|
+++ b/multi_channel/common/CMakeLists.txt
|
|
@@ -110,7 +110,7 @@ endif()
|
|
|
|
target_include_directories(${TARGET_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
|
|
|
|
-target_link_libraries(${TARGET_NAME} ${InferenceEngine_LIBRARIES} gflags ${OpenCV_LIBRARIES})
|
|
+target_link_libraries(${TARGET_NAME} ${InferenceEngine_LIBRARIES} ${GFLAGS_LIBRARIES} ${OpenCV_LIBRARIES})
|
|
|
|
if(UNIX)
|
|
target_link_libraries( ${TARGET_NAME} pthread)
|
|
diff --git a/multi_channel/face_detection_demo/CMakeLists.txt b/multi_channel/face_detection_demo/CMakeLists.txt
|
|
index 5b497fc..78c518e 100644
|
|
--- a/multi_channel/face_detection_demo/CMakeLists.txt
|
|
+++ b/multi_channel/face_detection_demo/CMakeLists.txt
|
|
@@ -60,7 +60,7 @@ if(MULTICHANNEL_DEMO_USE_TBB)
|
|
endif()
|
|
endif()
|
|
|
|
-target_link_libraries(${TARGET_NAME} ${InferenceEngine_LIBRARIES} gflags ${OpenCV_LIBRARIES} common)
|
|
+target_link_libraries(${TARGET_NAME} ${InferenceEngine_LIBRARIES} ${GFLAGS_LIBRARIES} ${OpenCV_LIBRARIES} common)
|
|
|
|
if(UNIX)
|
|
target_link_libraries( ${TARGET_NAME} pthread)
|
|
diff --git a/multi_channel/human_pose_estimation_demo/CMakeLists.txt b/multi_channel/human_pose_estimation_demo/CMakeLists.txt
|
|
index 7fe4823..7e76796 100644
|
|
--- a/multi_channel/human_pose_estimation_demo/CMakeLists.txt
|
|
+++ b/multi_channel/human_pose_estimation_demo/CMakeLists.txt
|
|
@@ -60,7 +60,7 @@ if(MULTICHANNEL_DEMO_USE_TBB)
|
|
endif()
|
|
endif()
|
|
|
|
-target_link_libraries(${TARGET_NAME} ${InferenceEngine_LIBRARIES} gflags ${OpenCV_LIBRARIES} common)
|
|
+target_link_libraries(${TARGET_NAME} ${InferenceEngine_LIBRARIES} ${GFLAGS_LIBRARIES} ${OpenCV_LIBRARIES} common)
|
|
|
|
if(UNIX)
|
|
target_link_libraries( ${TARGET_NAME} pthread)
|
|
diff --git a/multi_channel/object_detection_demo_yolov3/CMakeLists.txt b/multi_channel/object_detection_demo_yolov3/CMakeLists.txt
|
|
index e959349..cf1de4a 100644
|
|
--- a/multi_channel/object_detection_demo_yolov3/CMakeLists.txt
|
|
+++ b/multi_channel/object_detection_demo_yolov3/CMakeLists.txt
|
|
@@ -60,7 +60,7 @@ if(MULTICHANNEL_DEMO_USE_TBB)
|
|
endif()
|
|
endif()
|
|
|
|
-target_link_libraries(${TARGET_NAME} ${InferenceEngine_LIBRARIES} gflags ${OpenCV_LIBRARIES} ngraph::ngraph common)
|
|
+target_link_libraries(${TARGET_NAME} ${InferenceEngine_LIBRARIES} ${GFLAGS_LIBRARIES} ${OpenCV_LIBRARIES} ngraph::ngraph common)
|
|
|
|
if(UNIX)
|
|
target_link_libraries( ${TARGET_NAME} pthread)
|
|
--
|
|
2.25.4
|
|
|