mirror of
git://git.yoctoproject.org/meta-intel.git
synced 2025-07-19 21:09:03 +02:00
90b225ce8a
* 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>
94 lines
3.8 KiB
Diff
94 lines
3.8 KiB
Diff
From 68d6b80eb9cc87ff3598958b8a7f52b688b9436f Mon Sep 17 00:00:00 2001
|
|
From: Anuj Mittal <anuj.mittal@intel.com>
|
|
Date: Fri, 27 Sep 2019 20:32:08 +0800
|
|
Subject: [PATCH] disable werror
|
|
|
|
This shouldn't be enabled and leads to multiple errors when compiling
|
|
cldnn and samples.
|
|
|
|
Upstream-Status: Pending
|
|
|
|
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
|
|
---
|
|
inference-engine/cmake/os_flags.cmake | 1 -
|
|
inference-engine/samples/CMakeLists.txt | 1 -
|
|
inference-engine/src/extension/CMakeLists.txt | 1 -
|
|
inference-engine/thirdparty/clDNN/CMakeLists.txt | 2 --
|
|
inference-engine/thirdparty/mkl-dnn/cmake/platform.cmake | 1 -
|
|
inference-engine/tools/CMakeLists.txt | 1 -
|
|
6 files changed, 7 deletions(-)
|
|
|
|
diff --git a/inference-engine/cmake/os_flags.cmake b/inference-engine/cmake/os_flags.cmake
|
|
index 6a5442f..a14a1ae 100644
|
|
--- a/inference-engine/cmake/os_flags.cmake
|
|
+++ b/inference-engine/cmake/os_flags.cmake
|
|
@@ -48,7 +48,6 @@ if (WIN32)
|
|
set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${DEBUG_SYMBOLS_LINKER_FLAGS}")
|
|
endif()
|
|
else()
|
|
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Werror=return-type ")
|
|
if (APPLE)
|
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=unused-command-line-argument")
|
|
elseif(UNIX)
|
|
diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt
|
|
index dd7b679..828abe6 100644
|
|
--- a/inference-engine/samples/CMakeLists.txt
|
|
+++ b/inference-engine/samples/CMakeLists.txt
|
|
@@ -59,7 +59,6 @@ if (WIN32)
|
|
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4251 /wd4275 /wd4267") #disable some warnings
|
|
endif()
|
|
else()
|
|
- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror") #treating warnings as errors
|
|
if (APPLE)
|
|
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=unused-command-line-argument")
|
|
elseif(UNIX)
|
|
diff --git a/inference-engine/src/extension/CMakeLists.txt b/inference-engine/src/extension/CMakeLists.txt
|
|
index fb14ebe..228bb8c 100644
|
|
--- a/inference-engine/src/extension/CMakeLists.txt
|
|
+++ b/inference-engine/src/extension/CMakeLists.txt
|
|
@@ -25,7 +25,6 @@ if (WIN32)
|
|
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4251 /wd4275 /wd4267") #disable some warnings
|
|
endif()
|
|
else()
|
|
- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
|
|
endif()
|
|
|
|
if (${CMAKE_CXX_COMPILER_ID} STREQUAL GNU)
|
|
diff --git a/inference-engine/thirdparty/clDNN/CMakeLists.txt b/inference-engine/thirdparty/clDNN/CMakeLists.txt
|
|
index 5957791..6007be4 100644
|
|
--- a/inference-engine/thirdparty/clDNN/CMakeLists.txt
|
|
+++ b/inference-engine/thirdparty/clDNN/CMakeLists.txt
|
|
@@ -758,8 +758,6 @@ foreach(__CLDNN_CompilerFlagName IN ITEMS "CMAKE_CXX_FLAGS" "CMAKE_C_FLAGS")
|
|
MultiProcessorCompilation
|
|
DeadCodeEliminate
|
|
ExtensionsEnabled
|
|
- TreatWarnAsErrorEnabled
|
|
- WarnLevel4
|
|
NoFastMath
|
|
StackProtector
|
|
)
|
|
diff --git a/inference-engine/thirdparty/mkl-dnn/cmake/platform.cmake b/inference-engine/thirdparty/mkl-dnn/cmake/platform.cmake
|
|
index a541215..bed8a59 100644
|
|
--- a/inference-engine/thirdparty/mkl-dnn/cmake/platform.cmake
|
|
+++ b/inference-engine/thirdparty/mkl-dnn/cmake/platform.cmake
|
|
@@ -63,7 +63,6 @@ if(MSVC)
|
|
endif()
|
|
elseif(UNIX OR MINGW)
|
|
append(CMAKE_CCXX_FLAGS "-Wall -Wno-unknown-pragmas")
|
|
- append_if_product(CMAKE_CCXX_FLAGS "-Werror")
|
|
append(CMAKE_CCXX_FLAGS "-fvisibility=internal")
|
|
append(CMAKE_C_FLAGS "-std=c99")
|
|
append(CMAKE_CXX_FLAGS "-std=c++11 -fvisibility-inlines-hidden")
|
|
diff --git a/inference-engine/tools/CMakeLists.txt b/inference-engine/tools/CMakeLists.txt
|
|
index fddfa28..a714fc1 100644
|
|
--- a/inference-engine/tools/CMakeLists.txt
|
|
+++ b/inference-engine/tools/CMakeLists.txt
|
|
@@ -24,7 +24,6 @@ endif()
|
|
if (WIN32)
|
|
# add_compile_options("/WX")
|
|
else()
|
|
- add_compile_options("-Werror")
|
|
endif()
|
|
|
|
if (ENABLE_OPENCV)
|