mirror of
https://github.com/microsoft/vcpkg.git
synced 2026-01-18 01:11:23 +01:00
[bit7z] Upate to 4.0.10 (#45245)
Signed-off-by: l.feng <43399351+msclock@users.noreply.github.com> Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
This commit is contained in:
@@ -4,16 +4,16 @@ index f8ff6f0..855b78d 100644
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -194,15 +194,22 @@ include( cmake/BuildOptions.cmake )
|
||||
include( cmake/CompilerOptions.cmake )
|
||||
|
||||
|
||||
# dependencies
|
||||
-include( cmake/Dependencies.cmake )
|
||||
+# include( cmake/Dependencies.cmake )
|
||||
+find_package(7zip CONFIG REQUIRED)
|
||||
+add_library(7-zip ALIAS 7zip::7zip)
|
||||
|
||||
|
||||
# 7-zip source code
|
||||
target_link_libraries( ${LIB_TARGET} PRIVATE 7-zip )
|
||||
|
||||
|
||||
# filesystem library (needed if std::filesystem is not available)
|
||||
+if(0)
|
||||
if( ghc_filesystem_ADDED )
|
||||
@@ -23,6 +23,6 @@ index f8ff6f0..855b78d 100644
|
||||
+ find_package(ghc_filesystem CONFIG REQUIRED)
|
||||
+ target_link_libraries(${LIB_TARGET} PRIVATE ghcFilesystem::ghc_filesystem )
|
||||
+endif()
|
||||
|
||||
|
||||
# public includes
|
||||
target_include_directories( ${LIB_TARGET} PUBLIC "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>"
|
||||
|
||||
@@ -9,7 +9,7 @@ index 2eb8634..f8ff6f0 100644
|
||||
- PUBLIC ${PUBLIC_HEADERS}
|
||||
+ # PUBLIC ${PUBLIC_HEADERS}
|
||||
PRIVATE ${HEADERS} ${SOURCES} )
|
||||
|
||||
|
||||
# additional target without the architecture suffix in the name
|
||||
@@ -246,3 +246,29 @@ endif()
|
||||
if( BIT7Z_BUILD_DOCS )
|
||||
|
||||
@@ -4,7 +4,7 @@ vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO rikyoz/bit7z
|
||||
REF "v${VERSION}"
|
||||
SHA512 c0577b07301b09726fb46164483dc277d681a74a80a90a1aa4881d949be28e6ec26678a0cfbf83e38b4915c8a724078e0771fecefba8c6dfbf9029f8db6063fa
|
||||
SHA512 18bd18bc7186c04d9c2e731c76f23ab97a796a0ec027dc7163626f30ca807ba98733dbcd96bbca9af0cd0497cede4561c84560bf4e28030f59e1e34c1d98204d
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
fix_install.patch
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
{
|
||||
"name": "bit7z",
|
||||
"version": "4.0.9",
|
||||
"port-version": 1,
|
||||
"version": "4.0.10",
|
||||
"description": "A C++ static library offering a clean and simple interface to the 7-zip shared libraries.",
|
||||
"homepage": "https://github.com/rikyoz/bit7z",
|
||||
"license": "MPL-2.0",
|
||||
|
||||
@@ -57,6 +57,7 @@ apr:arm64-windows=fail # Cross compiling CI machine cannot run gen_test_char to
|
||||
armadillo:arm64-android=cascade
|
||||
armadillo:x64-android=cascade
|
||||
armadillo:arm-neon-android=cascade
|
||||
bit7z(uwp)=cascade
|
||||
blitz:arm-uwp=fail
|
||||
blitz:arm64-windows=fail
|
||||
blitz:x64-uwp=fail
|
||||
|
||||
@@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "d1aa6e09fb69b63f1fe62bb4dc2a6e6768fad7aa",
|
||||
"version": "4.0.10",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "761234aa0ad3687fccc86bf939350659f9d137d6",
|
||||
"version": "4.0.9",
|
||||
|
||||
@@ -685,8 +685,8 @@
|
||||
"port-version": 3
|
||||
},
|
||||
"bit7z": {
|
||||
"baseline": "4.0.9",
|
||||
"port-version": 1
|
||||
"baseline": "4.0.10",
|
||||
"port-version": 0
|
||||
},
|
||||
"bitmagic": {
|
||||
"baseline": "8.0.1",
|
||||
|
||||
Reference in New Issue
Block a user