184 строки
7.9 KiB
Diff
184 строки
7.9 KiB
Diff
|
From 8ecfdb80f318e5907083812d1b39131f07145937 Mon Sep 17 00:00:00 2001
|
||
|
From: Major Hayden <major@mhtx.net>
|
||
|
Date: Wed, 22 Sep 2021 06:28:20 -0500
|
||
|
Subject: [PATCH] Disable treating warnings as errors
|
||
|
|
||
|
---
|
||
|
.../configs/azure_iot_build_rules.cmake | 7 -------
|
||
|
.../azure-c-shared-utility/deps/umock-c/CMakeLists.txt | 10 ----------
|
||
|
.../deps/umock-c/deps/ctest/CMakeLists.txt | 8 +++-----
|
||
|
.../testtools/ctest/CMakeLists.txt | 8 +++-----
|
||
|
src/vendor/azure-uamqp-c/deps/umock-c/CMakeLists.txt | 10 ----------
|
||
|
.../deps/umock-c/deps/ctest/CMakeLists.txt | 8 +++-----
|
||
|
6 files changed, 9 insertions(+), 42 deletions(-)
|
||
|
|
||
|
diff --git a/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/configs/azure_iot_build_rules.cmake b/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/configs/azure_iot_build_rules.cmake
|
||
|
index ef831af..621d2c5 100644
|
||
|
--- a/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/configs/azure_iot_build_rules.cmake
|
||
|
+++ b/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/configs/azure_iot_build_rules.cmake
|
||
|
@@ -71,8 +71,6 @@ if(MSVC)
|
||
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W3")
|
||
|
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W3")
|
||
|
elseif(UNIX) #LINUX OR APPLE
|
||
|
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
|
||
|
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
|
||
|
if(NOT (IN_OPENWRT OR APPLE))
|
||
|
set (CMAKE_C_FLAGS "-D_POSIX_C_SOURCE=200112L ${CMAKE_C_FLAGS}")
|
||
|
endif()
|
||
|
@@ -192,10 +190,6 @@ IF((WIN32) AND (NOT(MINGW)))
|
||
|
add_definitions(-D_CRT_SECURE_NO_WARNINGS)
|
||
|
# Make warning as error
|
||
|
add_definitions(/WX)
|
||
|
-ELSE()
|
||
|
- # Make warning as error
|
||
|
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
|
||
|
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
|
||
|
ENDIF()
|
||
|
|
||
|
|
||
|
@@ -247,4 +241,3 @@ function(setTargetBuildProperties stbp_target)
|
||
|
set_target_properties(${stbp_target} PROPERTIES XCODE_ATTRIBUTE_GCC_WARN_UNUSED_VARIABLE "YES")
|
||
|
endif()
|
||
|
endfunction()
|
||
|
-
|
||
|
diff --git a/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/deps/umock-c/CMakeLists.txt b/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/deps/umock-c/CMakeLists.txt
|
||
|
index dead94d..9343a1d 100644
|
||
|
--- a/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/deps/umock-c/CMakeLists.txt
|
||
|
+++ b/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/deps/umock-c/CMakeLists.txt
|
||
|
@@ -22,15 +22,6 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
|
||
|
# Build with -fPIC always
|
||
|
set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
|
||
|
|
||
|
-# Build with -Werror
|
||
|
-if(MSVC)
|
||
|
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4")
|
||
|
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W4")
|
||
|
-elseif(UNIX) # LINUX OR APPLE
|
||
|
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
|
||
|
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
|
||
|
-endif()
|
||
|
-
|
||
|
include (CTest)
|
||
|
include (CheckIncludeFiles)
|
||
|
|
||
|
@@ -206,4 +197,3 @@ install(
|
||
|
DESTINATION
|
||
|
${package_location}
|
||
|
)
|
||
|
-
|
||
|
diff --git a/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/deps/umock-c/deps/ctest/CMakeLists.txt b/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/deps/umock-c/deps/ctest/CMakeLists.txt
|
||
|
index ddac93f..3bdee8e 100644
|
||
|
--- a/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/deps/umock-c/deps/ctest/CMakeLists.txt
|
||
|
+++ b/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/deps/umock-c/deps/ctest/CMakeLists.txt
|
||
|
@@ -51,21 +51,19 @@ if(MSVC)
|
||
|
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W3")
|
||
|
# WEC 2013 uses older VS compiler. Build some files as C++ files to resolve C99 related compile issues
|
||
|
SET_SOURCE_FILES_PROPERTIES(src/consolelogger.c src/xlogging.c src/map.c adapters/uniqueid_win32.c adapters/httpapi_wince.c src/tlsio_schannel.c src/x509_schannel.c PROPERTIES LANGUAGE CXX)
|
||
|
- add_definitions(-DWIN32) #WEC 2013
|
||
|
+ add_definitions(-DWIN32) #WEC 2013
|
||
|
ELSE()
|
||
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX")
|
||
|
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX")
|
||
|
-
|
||
|
+
|
||
|
endif()
|
||
|
elseif(LINUX)
|
||
|
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
|
||
|
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
|
||
|
if(NOT IN_OPENWRT)
|
||
|
set (CMAKE_C_FLAGS "-D_POSIX_C_SOURCE=200112L ${CMAKE_C_FLAGS}")
|
||
|
endif()
|
||
|
endif()
|
||
|
|
||
|
-if (NOT TARGET azure_macro_utils_c)
|
||
|
+if (NOT TARGET azure_macro_utils_c)
|
||
|
if (EXISTS ${CMAKE_CURRENT_LIST_DIR}/deps/azure-macro-utils-c/CMakeLists.txt)
|
||
|
add_subdirectory(deps/azure-macro-utils-c)
|
||
|
else()
|
||
|
diff --git a/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/testtools/ctest/CMakeLists.txt b/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/testtools/ctest/CMakeLists.txt
|
||
|
index ddac93f..3bdee8e 100644
|
||
|
--- a/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/testtools/ctest/CMakeLists.txt
|
||
|
+++ b/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/testtools/ctest/CMakeLists.txt
|
||
|
@@ -51,21 +51,19 @@ if(MSVC)
|
||
|
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W3")
|
||
|
# WEC 2013 uses older VS compiler. Build some files as C++ files to resolve C99 related compile issues
|
||
|
SET_SOURCE_FILES_PROPERTIES(src/consolelogger.c src/xlogging.c src/map.c adapters/uniqueid_win32.c adapters/httpapi_wince.c src/tlsio_schannel.c src/x509_schannel.c PROPERTIES LANGUAGE CXX)
|
||
|
- add_definitions(-DWIN32) #WEC 2013
|
||
|
+ add_definitions(-DWIN32) #WEC 2013
|
||
|
ELSE()
|
||
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX")
|
||
|
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX")
|
||
|
-
|
||
|
+
|
||
|
endif()
|
||
|
elseif(LINUX)
|
||
|
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
|
||
|
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
|
||
|
if(NOT IN_OPENWRT)
|
||
|
set (CMAKE_C_FLAGS "-D_POSIX_C_SOURCE=200112L ${CMAKE_C_FLAGS}")
|
||
|
endif()
|
||
|
endif()
|
||
|
|
||
|
-if (NOT TARGET azure_macro_utils_c)
|
||
|
+if (NOT TARGET azure_macro_utils_c)
|
||
|
if (EXISTS ${CMAKE_CURRENT_LIST_DIR}/deps/azure-macro-utils-c/CMakeLists.txt)
|
||
|
add_subdirectory(deps/azure-macro-utils-c)
|
||
|
else()
|
||
|
diff --git a/src/vendor/azure-uamqp-c/deps/umock-c/CMakeLists.txt b/src/vendor/azure-uamqp-c/deps/umock-c/CMakeLists.txt
|
||
|
index ac865be..9343a1d 100644
|
||
|
--- a/src/vendor/azure-uamqp-c/deps/umock-c/CMakeLists.txt
|
||
|
+++ b/src/vendor/azure-uamqp-c/deps/umock-c/CMakeLists.txt
|
||
|
@@ -22,15 +22,6 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
|
||
|
# Build with -fPIC always
|
||
|
set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
|
||
|
|
||
|
-# Build with -Werror
|
||
|
-if(MSVC)
|
||
|
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W3")
|
||
|
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W3")
|
||
|
-elseif(UNIX) # LINUX OR APPLE
|
||
|
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
|
||
|
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
|
||
|
-endif()
|
||
|
-
|
||
|
include (CTest)
|
||
|
include (CheckIncludeFiles)
|
||
|
|
||
|
@@ -206,4 +197,3 @@ install(
|
||
|
DESTINATION
|
||
|
${package_location}
|
||
|
)
|
||
|
-
|
||
|
diff --git a/src/vendor/azure-uamqp-c/deps/umock-c/deps/ctest/CMakeLists.txt b/src/vendor/azure-uamqp-c/deps/umock-c/deps/ctest/CMakeLists.txt
|
||
|
index ddac93f..3bdee8e 100644
|
||
|
--- a/src/vendor/azure-uamqp-c/deps/umock-c/deps/ctest/CMakeLists.txt
|
||
|
+++ b/src/vendor/azure-uamqp-c/deps/umock-c/deps/ctest/CMakeLists.txt
|
||
|
@@ -51,21 +51,19 @@ if(MSVC)
|
||
|
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W3")
|
||
|
# WEC 2013 uses older VS compiler. Build some files as C++ files to resolve C99 related compile issues
|
||
|
SET_SOURCE_FILES_PROPERTIES(src/consolelogger.c src/xlogging.c src/map.c adapters/uniqueid_win32.c adapters/httpapi_wince.c src/tlsio_schannel.c src/x509_schannel.c PROPERTIES LANGUAGE CXX)
|
||
|
- add_definitions(-DWIN32) #WEC 2013
|
||
|
+ add_definitions(-DWIN32) #WEC 2013
|
||
|
ELSE()
|
||
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX")
|
||
|
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX")
|
||
|
-
|
||
|
+
|
||
|
endif()
|
||
|
elseif(LINUX)
|
||
|
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
|
||
|
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
|
||
|
if(NOT IN_OPENWRT)
|
||
|
set (CMAKE_C_FLAGS "-D_POSIX_C_SOURCE=200112L ${CMAKE_C_FLAGS}")
|
||
|
endif()
|
||
|
endif()
|
||
|
|
||
|
-if (NOT TARGET azure_macro_utils_c)
|
||
|
+if (NOT TARGET azure_macro_utils_c)
|
||
|
if (EXISTS ${CMAKE_CURRENT_LIST_DIR}/deps/azure-macro-utils-c/CMakeLists.txt)
|
||
|
add_subdirectory(deps/azure-macro-utils-c)
|
||
|
else()
|
||
|
--
|
||
|
2.31.1
|
||
|
|