[libarchive] Disable C4061 which causes build to fail in Visual Studio 2019 16.6 (#11570)

* [libarchive] Disable C4061 which causes build to fail in Visual Studio 2019 16.6

* Bump verison.
This commit is contained in:
Billy O'Neal 2020-05-26 21:01:32 -07:00 committed by GitHub
parent cb538ed22f
commit af56d50d64
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 2 deletions

View File

@ -1,5 +1,5 @@
Source: libarchive
Version: 3.4.1-2
Version: 3.4.1-3
Homepage: https://github.com/libarchive/libarchive
Description: Library for reading and writing streaming archives
Build-Depends: zlib

View File

@ -0,0 +1,14 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 911ae5b..0e12b56 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -151,9 +151,6 @@ IF (MSVC)
#################################################################
# Set compile flags for debug build.
# This is added into CMAKE_C_FLAGS when CMAKE_BUILD_TYPE is "Debug"
- # Enable level 4 C4061: The enumerate has no associated handler in a switch
- # statement.
- SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /we4061")
# Enable level 4 C4254: A larger bit field was assigned to a smaller bit
# field.
SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /we4254")

View File

@ -12,6 +12,7 @@ vcpkg_from_github(
fix-lz4.patch
fix-zstd.patch
fix-cpu-set.patch
disable-c4061.patch
)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
@ -84,4 +85,4 @@ foreach(HEADER ${CURRENT_PACKAGES_DIR}/include/archive.h ${CURRENT_PACKAGES_DIR}
file(WRITE ${HEADER} "${CONTENTS}")
endforeach()
file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)