diff options
Diffstat (limited to 'dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-disable-werror.patch')
-rw-r--r-- | dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-disable-werror.patch | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-disable-werror.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-disable-werror.patch index b5f52d56..ca912fdf 100644 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-disable-werror.patch +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-disable-werror.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 68d6b80eb9cc87ff3598958b8a7f52b688b9436f Mon Sep 17 00:00:00 2001 | 1 | From 1ca4d5de754c6ee90f685f2706f657800cad8386 Mon Sep 17 00:00:00 2001 |
2 | From: Anuj Mittal <anuj.mittal@intel.com> | 2 | From: Anuj Mittal <anuj.mittal@intel.com> |
3 | Date: Fri, 27 Sep 2019 20:32:08 +0800 | 3 | Date: Fri, 27 Sep 2019 20:32:08 +0800 |
4 | Subject: [PATCH] disable werror | 4 | Subject: [PATCH 4/7] disable werror |
5 | 5 | ||
6 | This shouldn't be enabled and leads to multiple errors when compiling | 6 | This shouldn't be enabled and leads to multiple errors when compiling |
7 | cldnn and samples. | 7 | cldnn and samples. |
@@ -9,6 +9,7 @@ cldnn and samples. | |||
9 | Upstream-Status: Pending | 9 | Upstream-Status: Pending |
10 | 10 | ||
11 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | 11 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> |
12 | Signed-off-by: Chin Huat Ang <chin.huat.ang@intel.com> | ||
12 | --- | 13 | --- |
13 | inference-engine/cmake/os_flags.cmake | 1 - | 14 | inference-engine/cmake/os_flags.cmake | 1 - |
14 | inference-engine/samples/CMakeLists.txt | 1 - | 15 | inference-engine/samples/CMakeLists.txt | 1 - |
@@ -19,19 +20,19 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | |||
19 | 6 files changed, 7 deletions(-) | 20 | 6 files changed, 7 deletions(-) |
20 | 21 | ||
21 | diff --git a/inference-engine/cmake/os_flags.cmake b/inference-engine/cmake/os_flags.cmake | 22 | diff --git a/inference-engine/cmake/os_flags.cmake b/inference-engine/cmake/os_flags.cmake |
22 | index 6a5442f..a14a1ae 100644 | 23 | index ad15859..d471246 100644 |
23 | --- a/inference-engine/cmake/os_flags.cmake | 24 | --- a/inference-engine/cmake/os_flags.cmake |
24 | +++ b/inference-engine/cmake/os_flags.cmake | 25 | +++ b/inference-engine/cmake/os_flags.cmake |
25 | @@ -48,7 +48,6 @@ if (WIN32) | 26 | @@ -47,7 +47,6 @@ if (WIN32) |
26 | set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${DEBUG_SYMBOLS_LINKER_FLAGS}") | 27 | set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${DEBUG_SYMBOLS_LINKER_FLAGS}") |
27 | endif() | 28 | endif() |
28 | else() | 29 | else() |
29 | - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Werror=return-type ") | 30 | - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Werror=return-type ") |
30 | if (APPLE) | 31 | if (APPLE) |
31 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=unused-command-line-argument") | 32 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=unused-command-line-argument") |
32 | elseif(UNIX) | 33 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-function") |
33 | diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt | 34 | diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt |
34 | index dd7b679..828abe6 100644 | 35 | index 25f9f23..9aa5d5a 100644 |
35 | --- a/inference-engine/samples/CMakeLists.txt | 36 | --- a/inference-engine/samples/CMakeLists.txt |
36 | +++ b/inference-engine/samples/CMakeLists.txt | 37 | +++ b/inference-engine/samples/CMakeLists.txt |
37 | @@ -59,7 +59,6 @@ if (WIN32) | 38 | @@ -59,7 +59,6 @@ if (WIN32) |
@@ -55,10 +56,10 @@ index fb14ebe..228bb8c 100644 | |||
55 | 56 | ||
56 | if (${CMAKE_CXX_COMPILER_ID} STREQUAL GNU) | 57 | if (${CMAKE_CXX_COMPILER_ID} STREQUAL GNU) |
57 | diff --git a/inference-engine/thirdparty/clDNN/CMakeLists.txt b/inference-engine/thirdparty/clDNN/CMakeLists.txt | 58 | diff --git a/inference-engine/thirdparty/clDNN/CMakeLists.txt b/inference-engine/thirdparty/clDNN/CMakeLists.txt |
58 | index 5957791..6007be4 100644 | 59 | index 03e5bad..b9a3f5d 100644 |
59 | --- a/inference-engine/thirdparty/clDNN/CMakeLists.txt | 60 | --- a/inference-engine/thirdparty/clDNN/CMakeLists.txt |
60 | +++ b/inference-engine/thirdparty/clDNN/CMakeLists.txt | 61 | +++ b/inference-engine/thirdparty/clDNN/CMakeLists.txt |
61 | @@ -758,8 +758,6 @@ foreach(__CLDNN_CompilerFlagName IN ITEMS "CMAKE_CXX_FLAGS" "CMAKE_C_FLAGS") | 62 | @@ -760,8 +760,6 @@ foreach(__CLDNN_CompilerFlagName IN ITEMS "CMAKE_CXX_FLAGS" "CMAKE_C_FLAGS") |
62 | MultiProcessorCompilation | 63 | MultiProcessorCompilation |
63 | DeadCodeEliminate | 64 | DeadCodeEliminate |
64 | ExtensionsEnabled | 65 | ExtensionsEnabled |
@@ -80,7 +81,7 @@ index a541215..bed8a59 100644 | |||
80 | append(CMAKE_C_FLAGS "-std=c99") | 81 | append(CMAKE_C_FLAGS "-std=c99") |
81 | append(CMAKE_CXX_FLAGS "-std=c++11 -fvisibility-inlines-hidden") | 82 | append(CMAKE_CXX_FLAGS "-std=c++11 -fvisibility-inlines-hidden") |
82 | diff --git a/inference-engine/tools/CMakeLists.txt b/inference-engine/tools/CMakeLists.txt | 83 | diff --git a/inference-engine/tools/CMakeLists.txt b/inference-engine/tools/CMakeLists.txt |
83 | index fddfa28..a714fc1 100644 | 84 | index 3d80df3..b6cb7d8 100644 |
84 | --- a/inference-engine/tools/CMakeLists.txt | 85 | --- a/inference-engine/tools/CMakeLists.txt |
85 | +++ b/inference-engine/tools/CMakeLists.txt | 86 | +++ b/inference-engine/tools/CMakeLists.txt |
86 | @@ -24,7 +24,6 @@ endif() | 87 | @@ -24,7 +24,6 @@ endif() |
@@ -91,3 +92,6 @@ index fddfa28..a714fc1 100644 | |||
91 | endif() | 92 | endif() |
92 | 93 | ||
93 | if (ENABLE_OPENCV) | 94 | if (ENABLE_OPENCV) |
95 | -- | ||
96 | 2.7.4 | ||
97 | |||