mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-06-07 18:32:47 +08:00
[Minizip] enable clang-cl builds (#25960)
* minizip enable clang-cl builds * v db * update scripts in port * v db
This commit is contained in:
parent
6b67ad7e48
commit
4ad8fc2a83
13
ports/minizip/0004-define.patch
Normal file
13
ports/minizip/0004-define.patch
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
diff --git a/contrib/minizip/iowin32.c b/contrib/minizip/iowin32.c
|
||||||
|
index 274f39eb1..9736fbb0f 100644
|
||||||
|
--- a/contrib/minizip/iowin32.c
|
||||||
|
+++ b/contrib/minizip/iowin32.c
|
||||||
|
@@ -27,7 +27,7 @@
|
||||||
|
|
||||||
|
|
||||||
|
// see Include/shared/winapifamily.h in the Windows Kit
|
||||||
|
-#if defined(WINAPI_FAMILY_PARTITION) && (!(defined(IOWIN32_USING_WINRT_API)))
|
||||||
|
+#if defined(WINAPI_FAMILY_ONE_PARTITION) && (!(defined(IOWIN32_USING_WINRT_API)))
|
||||||
|
#if WINAPI_FAMILY_ONE_PARTITION(WINAPI_FAMILY, WINAPI_PARTITION_APP)
|
||||||
|
#define IOWIN32_USING_WINRT_API 1
|
||||||
|
#endif
|
@ -10,18 +10,18 @@ vcpkg_from_github(
|
|||||||
0001-remove-ifndef-NOUNCRYPT.patch
|
0001-remove-ifndef-NOUNCRYPT.patch
|
||||||
0002-add-declaration-for-mkdir.patch
|
0002-add-declaration-for-mkdir.patch
|
||||||
0003-no-io64.patch
|
0003-no-io64.patch
|
||||||
|
0004-define.patch
|
||||||
)
|
)
|
||||||
|
|
||||||
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
||||||
bzip2 ENABLE_BZIP2
|
bzip2 ENABLE_BZIP2
|
||||||
)
|
)
|
||||||
|
|
||||||
configure_file(${CMAKE_CURRENT_LIST_DIR}/minizipConfig.cmake.in ${SOURCE_PATH}/cmake/minizipConfig.cmake.in COPYONLY)
|
configure_file("${CMAKE_CURRENT_LIST_DIR}/minizipConfig.cmake.in" "${SOURCE_PATH}/cmake/minizipConfig.cmake.in" COPYONLY)
|
||||||
configure_file(${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt ${SOURCE_PATH}/CMakeLists.txt COPYONLY)
|
configure_file("${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" "${SOURCE_PATH}/CMakeLists.txt" COPYONLY)
|
||||||
|
|
||||||
vcpkg_configure_cmake(
|
vcpkg_cmake_configure(
|
||||||
SOURCE_PATH ${SOURCE_PATH}
|
SOURCE_PATH "${SOURCE_PATH}"
|
||||||
PREFER_NINJA
|
|
||||||
OPTIONS
|
OPTIONS
|
||||||
${FEATURE_OPTIONS}
|
${FEATURE_OPTIONS}
|
||||||
-DDISABLE_INSTALL_TOOLS=${VCPKG_TARGET_IS_IOS}
|
-DDISABLE_INSTALL_TOOLS=${VCPKG_TARGET_IS_IOS}
|
||||||
@ -29,10 +29,10 @@ vcpkg_configure_cmake(
|
|||||||
-DDISABLE_INSTALL_HEADERS=ON
|
-DDISABLE_INSTALL_HEADERS=ON
|
||||||
)
|
)
|
||||||
|
|
||||||
vcpkg_install_cmake()
|
vcpkg_cmake_install()
|
||||||
vcpkg_copy_pdbs()
|
vcpkg_copy_pdbs()
|
||||||
vcpkg_fixup_cmake_targets()
|
vcpkg_cmake_config_fixup()
|
||||||
vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/minizip)
|
vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/minizip")
|
||||||
|
|
||||||
if ("bzip2" IN_LIST FEATURES)
|
if ("bzip2" IN_LIST FEATURES)
|
||||||
file(GLOB HEADERS "${CURRENT_PACKAGES_DIR}/include/minizip/*.h")
|
file(GLOB HEADERS "${CURRENT_PACKAGES_DIR}/include/minizip/*.h")
|
||||||
@ -43,4 +43,4 @@ if ("bzip2" IN_LIST FEATURES)
|
|||||||
endforeach()
|
endforeach()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
file(INSTALL ${SOURCE_PATH}/contrib/minizip/MiniZip64_info.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
file(INSTALL "${SOURCE_PATH}/contrib/minizip/MiniZip64_info.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
||||||
|
@ -1,11 +1,19 @@
|
|||||||
{
|
{
|
||||||
"name": "minizip",
|
"name": "minizip",
|
||||||
"version-semver": "1.2.11",
|
"version-semver": "1.2.11",
|
||||||
"port-version": 10,
|
"port-version": 11,
|
||||||
"description": "Zip compression library",
|
"description": "Zip compression library",
|
||||||
"homepage": "https://github.com/madler/zlib",
|
"homepage": "https://github.com/madler/zlib",
|
||||||
"supports": "!uwp",
|
"supports": "!uwp",
|
||||||
"dependencies": [
|
"dependencies": [
|
||||||
|
{
|
||||||
|
"name": "vcpkg-cmake",
|
||||||
|
"host": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "vcpkg-cmake-config",
|
||||||
|
"host": true
|
||||||
|
},
|
||||||
"zlib"
|
"zlib"
|
||||||
],
|
],
|
||||||
"features": {
|
"features": {
|
||||||
|
@ -4622,7 +4622,7 @@
|
|||||||
},
|
},
|
||||||
"minizip": {
|
"minizip": {
|
||||||
"baseline": "1.2.11",
|
"baseline": "1.2.11",
|
||||||
"port-version": 10
|
"port-version": 11
|
||||||
},
|
},
|
||||||
"minizip-ng": {
|
"minizip-ng": {
|
||||||
"baseline": "3.0.5",
|
"baseline": "3.0.5",
|
||||||
|
@ -1,5 +1,10 @@
|
|||||||
{
|
{
|
||||||
"versions": [
|
"versions": [
|
||||||
|
{
|
||||||
|
"git-tree": "528703ed8d2b78aeaa55695765535efafa24540b",
|
||||||
|
"version-semver": "1.2.11",
|
||||||
|
"port-version": 11
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"git-tree": "c3bec48dc73b936a25a26a9ec1941aac9e39fcf1",
|
"git-tree": "c3bec48dc73b936a25a26a9ec1941aac9e39fcf1",
|
||||||
"version-semver": "1.2.11",
|
"version-semver": "1.2.11",
|
||||||
|
Loading…
Reference in New Issue
Block a user