[nifi-minifi-cpp] branch master updated: MINIFICPP-1164 patch libarchive-3.3.2 to avoid Werror

[aboda]

This is an automated email from the ASF dual-hosted git repository.

aboda pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git


The following commit(s) were added to refs/heads/master by this push:
     new 452c252  MINIFICPP-1164 patch libarchive-3.3.2 to avoid Werror
452c252 is described below

commit 452c252ed7d87ec9e1002493f8f898201c0abc6f
Author: Marton Szasz <szasz...@gmail.com>
AuthorDate: Tue Mar 10 13:49:23 2020 +0100

    MINIFICPP-1164 patch libarchive-3.3.2 to avoid Werror
    
    Otherwise it fails to build with GCC 7+
    
    Signed-off-by: Arpad Boda <ab...@apache.org>
    
    This closes #745
---
 thirdparty/libarchive-3.3.2/CMakeLists.txt | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/thirdparty/libarchive-3.3.2/CMakeLists.txt 
b/thirdparty/libarchive-3.3.2/CMakeLists.txt
index 0c1ea6f..9937606 100644
--- a/thirdparty/libarchive-3.3.2/CMakeLists.txt
+++ b/thirdparty/libarchive-3.3.2/CMakeLists.txt
@@ -96,7 +96,6 @@ IF (CMAKE_C_COMPILER_ID MATCHES "^GNU$")
   #################################################################
   # Set compile flags for debug build.
   # This is added into CMAKE_C_FLAGS when CMAKE_BUILD_TYPE is "Debug"
-  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Werror")
   SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wextra")
   SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wunused")
   SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wshadow")
@@ -112,7 +111,6 @@ IF (CMAKE_C_COMPILER_ID MATCHES "^Clang$")
   # Set compile flags for debug build.
   # This is added into CMAKE_C_FLAGS when CMAKE_BUILD_TYPE is "Debug"
   SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g")
-  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Werror")
   SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wextra")
   SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wunused")
   SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wshadow")
@@ -165,8 +163,6 @@ IF (MSVC)
   # Enable level 4 C4706: The test value in a conditional expression was the
   #                       result of an assignment.
   SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /we4706")
-  # /WX option is the same as gcc's -Werror option.
-  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /WX")
   # /Oi option enables built-in functions.
   SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /Oi")
   #################################################################