summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support/opencv/opencv/tinydnn.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-oe/recipes-support/opencv/opencv/tinydnn.patch')
-rw-r--r--meta-oe/recipes-support/opencv/opencv/tinydnn.patch34
1 files changed, 0 insertions, 34 deletions
diff --git a/meta-oe/recipes-support/opencv/opencv/tinydnn.patch b/meta-oe/recipes-support/opencv/opencv/tinydnn.patch
deleted file mode 100644
index c433fc312..000000000
--- a/meta-oe/recipes-support/opencv/opencv/tinydnn.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1Upstream-status: Inappropriate [OE specific]
2
3Signed-off-by: Ricardo Ribalda <ricardo.ribalda@gmail.com>
4diff --git a/modules/dnn_modern/CMakeLists.txt b/modules/dnn_modern/CMakeLists.txt
5index 79b64b12160b..ba06a0a163e4 100644
6--- a/modules/dnn_modern/CMakeLists.txt
7+++ b/modules/dnn_modern/CMakeLists.txt
8@@ -15,24 +15,8 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
9 # MODULE REQUIREMENTS
10 # ----------------------------------------------------------------------------
11
12-set(TINY_DNN_CPP_PATH "${OpenCV_BINARY_DIR}/3rdparty/tinydnn")
13-set(TINY_DNN_CPP_ROOT "${TINY_DNN_CPP_PATH}/tiny-dnn-1.0.0a3")
14-ocv_download(FILENAME "v1.0.0a3.tar.gz"
15- HASH "adb1c512e09ca2c7a6faef36f9c53e59"
16- URL
17- "${OPENCV_TINY_DNN_URL}"
18- "$ENV{OPENCV_TINY_DNN_URL}"
19- "https://github.com/tiny-dnn/tiny-dnn/archive/"
20- DESTINATION_DIR "${TINY_DNN_CPP_PATH}"
21- STATUS TINY_DNN_DOWNLOAD_SUCCESS
22- ID "tiny-dnn"
23- UNPACK RELATIVE_URL)
24-
25-if(NOT TINY_DNN_DOWNLOAD_SUCCESS)
26- message(STATUS "Failed to download tiny-dnn sources")
27-endif()
28-
29-find_package(TinyDNN QUIET)
30+set(TINYDNN_INCLUDE_DIRS "${OpenCV_SOURCE_DIR}/3rdparty/tinydnn/tiny-dnn-1.0.0a3")
31+set(TinyDNN_FOUND TRUE)
32
33 include(CheckCXXCompilerFlag)
34 CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)