[kubazip] update to 0.2.4 (#26368)

* [kubazip] update to 0.2.4

* x-add-version
This commit is contained in:
Lily Wang 2022-08-17 09:35:26 -07:00 committed by GitHub
parent 77fe434974
commit 5fb8f6c24e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 44 additions and 41 deletions

View File

@ -1,25 +1,16 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 55dfc77..f0182f9 100644
index cf86d70..c2bc2f9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.4)
cmake_minimum_required(VERSION 3.14)
-project(zip
+project(kubazip
LANGUAGES C
VERSION "0.1.19")
VERSION "0.2.3")
set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
@@ -15,7 +15,7 @@ if (MSVC)
elseif ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" OR
"${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" OR
"${CMAKE_C_COMPILER_ID}" STREQUAL "AppleClang")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -Wall -Wextra -Werror -pedantic")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -Wall -Wextra -pedantic")
endif (MSVC)
# zip
@@ -37,7 +37,7 @@ endif()
@@ -46,11 +46,11 @@ endif()
target_include_directories(${PROJECT_NAME} PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
@ -28,25 +19,23 @@ index 55dfc77..f0182f9 100644
)
# test
@@ -52,7 +52,7 @@ endif()
# Installation (https://github.com/forexample/package-example) {
-if (NOT CMAKE_DISABLE_TESTING)
+if (0)
enable_testing()
add_subdirectory(test)
endif()
@@ -69,12 +69,12 @@ if (MSVC)
elseif ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" OR
"${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" OR
"${CMAKE_C_COMPILER_ID}" STREQUAL "AppleClang")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror -pedantic")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -pedantic")
endif (MSVC)
####
set(CONFIG_INSTALL_DIR "lib/cmake/${PROJECT_NAME}")
-set(INCLUDE_INSTALL_DIR "include")
+set(INCLUDE_INSTALL_DIR "include/${PROJECT_NAME}")
set(GENERATED_DIR "${CMAKE_CURRENT_BINARY_DIR}/generated")
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 04c2123..002cf5a 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.4)
set(test_out test.out)
add_executable(${test_out} test.c)
-target_link_libraries(${test_out} zip)
+target_link_libraries(${test_out} kubazip)
add_test(NAME ${test_out} COMMAND ${test_out})

View File

@ -3,20 +3,19 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO kuba--/zip
REF 96924c94dabe362bbb1588aa70209e638e6fb35c
SHA512 bc3e9ecf39d54321314d09209f356a2491893591a016b1619abcdea8c1fb1fa8ba1f9858f4e758641df083ed237a2ec9f0af13e0f1d802502257644168ae8907
REF 42151612e8546c55485ec38cf0d57e57e51a8abd #v0.2.4
SHA512 9cbb7bcb8095c365c4529f06c883f3aa0c1038ed3aa6a0419dafb90355abf6e5cd02f7ffd5cbb54fe3893102bb21f568d415b71500630ad203a1f911b6e52ef5
HEAD_REF master
PATCHES
fix_targets.patch
)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
)
vcpkg_install_cmake()
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/kubazip)
vcpkg_cmake_install()
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/kubazip)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(INSTALL ${SOURCE_PATH}/UNLICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(INSTALL "${SOURCE_PATH}/UNLICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

View File

@ -1,7 +1,17 @@
{
"name": "kubazip",
"version-string": "0.1.19",
"port-version": 1,
"version": "0.2.4",
"description": "A portable, simple zip library written in C",
"homepage": "https://github.com/kuba--/zip"
"homepage": "https://github.com/kuba--/zip",
"license": "Unlicense",
"dependencies": [
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
}

View File

@ -3369,8 +3369,8 @@
"port-version": 0
},
"kubazip": {
"baseline": "0.1.19",
"port-version": 1
"baseline": "0.2.4",
"port-version": 0
},
"kubernetes": {
"baseline": "2022-01-19",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "14bf9d5b15ecf5769d10e5000e74167e97b0ade1",
"version": "0.2.4",
"port-version": 0
},
{
"git-tree": "131416be9d3de3fccb254751a17cd78e1252b464",
"version-string": "0.1.19",