diff options
author | Anuj Mittal <anuj.mittal@intel.com> | 2019-09-27 22:55:27 +0800 |
---|---|---|
committer | Anuj Mittal <anuj.mittal@intel.com> | 2019-09-30 15:34:44 +0800 |
commit | 90b225ce8a00aafd94d0aef5f85e73adce91d5f2 (patch) | |
tree | 2325156bd0cd0c4ab837e946181345d7d8c88ddb /dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-disable-werror.patch | |
parent | 096598691de246c23902d49d228c7562ba2c9cc5 (diff) | |
download | meta-intel-90b225ce8a00aafd94d0aef5f85e73adce91d5f2.tar.gz |
dldt-inference-engine: upgrade 2019r1.1 -> 2019r2
* Release notes:
https://software.intel.com/en-us/articles/OpenVINO-RelNotes
* Enable unit tests to be built and tested using ptest mechanism.
* Include patches from Clear Linux for build fixes.
* Switch to using python3 and threading to using TBB. Switch ENABLE_OPENCV
to off so opencv from system is used.
* Remove do_install and patch Makefiles instead to install libraries correctly.
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
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 | 93 |
1 files changed, 93 insertions, 0 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 new file mode 100644 index 00000000..b5f52d56 --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-disable-werror.patch | |||
@@ -0,0 +1,93 @@ | |||
1 | From 68d6b80eb9cc87ff3598958b8a7f52b688b9436f Mon Sep 17 00:00:00 2001 | ||
2 | From: Anuj Mittal <anuj.mittal@intel.com> | ||
3 | Date: Fri, 27 Sep 2019 20:32:08 +0800 | ||
4 | Subject: [PATCH] disable werror | ||
5 | |||
6 | This shouldn't be enabled and leads to multiple errors when compiling | ||
7 | cldnn and samples. | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | |||
11 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
12 | --- | ||
13 | inference-engine/cmake/os_flags.cmake | 1 - | ||
14 | inference-engine/samples/CMakeLists.txt | 1 - | ||
15 | inference-engine/src/extension/CMakeLists.txt | 1 - | ||
16 | inference-engine/thirdparty/clDNN/CMakeLists.txt | 2 -- | ||
17 | inference-engine/thirdparty/mkl-dnn/cmake/platform.cmake | 1 - | ||
18 | inference-engine/tools/CMakeLists.txt | 1 - | ||
19 | 6 files changed, 7 deletions(-) | ||
20 | |||
21 | diff --git a/inference-engine/cmake/os_flags.cmake b/inference-engine/cmake/os_flags.cmake | ||
22 | index 6a5442f..a14a1ae 100644 | ||
23 | --- a/inference-engine/cmake/os_flags.cmake | ||
24 | +++ b/inference-engine/cmake/os_flags.cmake | ||
25 | @@ -48,7 +48,6 @@ if (WIN32) | ||
26 | set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${DEBUG_SYMBOLS_LINKER_FLAGS}") | ||
27 | endif() | ||
28 | else() | ||
29 | - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Werror=return-type ") | ||
30 | if (APPLE) | ||
31 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=unused-command-line-argument") | ||
32 | elseif(UNIX) | ||
33 | diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt | ||
34 | index dd7b679..828abe6 100644 | ||
35 | --- a/inference-engine/samples/CMakeLists.txt | ||
36 | +++ b/inference-engine/samples/CMakeLists.txt | ||
37 | @@ -59,7 +59,6 @@ if (WIN32) | ||
38 | set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4251 /wd4275 /wd4267") #disable some warnings | ||
39 | endif() | ||
40 | else() | ||
41 | - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror") #treating warnings as errors | ||
42 | if (APPLE) | ||
43 | set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=unused-command-line-argument") | ||
44 | elseif(UNIX) | ||
45 | diff --git a/inference-engine/src/extension/CMakeLists.txt b/inference-engine/src/extension/CMakeLists.txt | ||
46 | index fb14ebe..228bb8c 100644 | ||
47 | --- a/inference-engine/src/extension/CMakeLists.txt | ||
48 | +++ b/inference-engine/src/extension/CMakeLists.txt | ||
49 | @@ -25,7 +25,6 @@ if (WIN32) | ||
50 | set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4251 /wd4275 /wd4267") #disable some warnings | ||
51 | endif() | ||
52 | else() | ||
53 | - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror") | ||
54 | endif() | ||
55 | |||
56 | 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 | index 5957791..6007be4 100644 | ||
59 | --- a/inference-engine/thirdparty/clDNN/CMakeLists.txt | ||
60 | +++ b/inference-engine/thirdparty/clDNN/CMakeLists.txt | ||
61 | @@ -758,8 +758,6 @@ foreach(__CLDNN_CompilerFlagName IN ITEMS "CMAKE_CXX_FLAGS" "CMAKE_C_FLAGS") | ||
62 | MultiProcessorCompilation | ||
63 | DeadCodeEliminate | ||
64 | ExtensionsEnabled | ||
65 | - TreatWarnAsErrorEnabled | ||
66 | - WarnLevel4 | ||
67 | NoFastMath | ||
68 | StackProtector | ||
69 | ) | ||
70 | diff --git a/inference-engine/thirdparty/mkl-dnn/cmake/platform.cmake b/inference-engine/thirdparty/mkl-dnn/cmake/platform.cmake | ||
71 | index a541215..bed8a59 100644 | ||
72 | --- a/inference-engine/thirdparty/mkl-dnn/cmake/platform.cmake | ||
73 | +++ b/inference-engine/thirdparty/mkl-dnn/cmake/platform.cmake | ||
74 | @@ -63,7 +63,6 @@ if(MSVC) | ||
75 | endif() | ||
76 | elseif(UNIX OR MINGW) | ||
77 | append(CMAKE_CCXX_FLAGS "-Wall -Wno-unknown-pragmas") | ||
78 | - append_if_product(CMAKE_CCXX_FLAGS "-Werror") | ||
79 | append(CMAKE_CCXX_FLAGS "-fvisibility=internal") | ||
80 | append(CMAKE_C_FLAGS "-std=c99") | ||
81 | 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 | index fddfa28..a714fc1 100644 | ||
84 | --- a/inference-engine/tools/CMakeLists.txt | ||
85 | +++ b/inference-engine/tools/CMakeLists.txt | ||
86 | @@ -24,7 +24,6 @@ endif() | ||
87 | if (WIN32) | ||
88 | # add_compile_options("/WX") | ||
89 | else() | ||
90 | - add_compile_options("-Werror") | ||
91 | endif() | ||
92 | |||
93 | if (ENABLE_OPENCV) | ||