aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCheney Wang <38240633+Cheney-W@users.noreply.github.com>2021-04-13 01:16:41 +0800
committerGitHub <noreply@github.com>2021-04-12 10:16:41 -0700
commitd01ed0ebd93b0b2036557c673c4fdeb35f98001c (patch)
treee1d12a1b140ba1046c44763fb48636ff21528b90
parentbc96cd54bf3afe85e4c1f201d6475f5ce0a4763c (diff)
downloadvcpkg-d01ed0ebd93b0b2036557c673c4fdeb35f98001c.tar.gz
vcpkg-d01ed0ebd93b0b2036557c673c4fdeb35f98001c.zip
[minizip-ng] Modify the output include path of the header file (#17238)
* [minizip-ng] Modify the output include path of the header file * Update json file Co-authored-by: Cheney-Wang <v-xincwa@microsoft.com>
-rw-r--r--ports/minizip-ng/Modify-header-file-path.patch13
-rw-r--r--ports/minizip-ng/portfile.cmake1
-rw-r--r--ports/minizip-ng/vcpkg.json1
-rw-r--r--versions/baseline.json2
-rw-r--r--versions/m-/minizip-ng.json5
5 files changed, 21 insertions, 1 deletions
diff --git a/ports/minizip-ng/Modify-header-file-path.patch b/ports/minizip-ng/Modify-header-file-path.patch
new file mode 100644
index 000000000..54299bac0
--- /dev/null
+++ b/ports/minizip-ng/Modify-header-file-path.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9ef8023..ec1ee55 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -81,7 +81,7 @@ include(FeatureSummary)
+
+ set(INSTALL_BIN_DIR ${CMAKE_INSTALL_FULL_BINDIR} CACHE PATH "Installation directory for executables")
+ set(INSTALL_LIB_DIR ${CMAKE_INSTALL_FULL_LIBDIR} CACHE PATH "Installation directory for libraries")
+-set(INSTALL_INC_DIR ${CMAKE_INSTALL_FULL_INCLUDEDIR} CACHE PATH "Installation directory for headers")
++set(INSTALL_INC_DIR ${CMAKE_INSTALL_FULL_INCLUDEDIR}/minizip-ng CACHE PATH "Installation directory for headers")
+ set(INSTALL_MAN_DIR ${CMAKE_INSTALL_FULL_MANDIR} CACHE PATH "Installation directory for manual pages")
+
+ set(STDLIB_DEF)
diff --git a/ports/minizip-ng/portfile.cmake b/ports/minizip-ng/portfile.cmake
index d7a27e11e..6d6cd7168 100644
--- a/ports/minizip-ng/portfile.cmake
+++ b/ports/minizip-ng/portfile.cmake
@@ -4,6 +4,7 @@ vcpkg_from_github(
REF 3.0.1
SHA512 98c9bdcea79a88a2dd69cec6c49f8565edf78ab9cddbf0e85e08b049b300b187f176bf57d5a894bf777bec0a097e46ecc05f78dab9cd5726fd473ffd8718dce0
HEAD_REF master
+ PATCHES Modify-header-file-path.patch
)
vcpkg_cmake_configure(
diff --git a/ports/minizip-ng/vcpkg.json b/ports/minizip-ng/vcpkg.json
index 35ee5fa6b..b40124581 100644
--- a/ports/minizip-ng/vcpkg.json
+++ b/ports/minizip-ng/vcpkg.json
@@ -1,6 +1,7 @@
{
"name": "minizip-ng",
"version": "3.0.1",
+ "port-version": 1,
"description": "minizip-ng is a zip manipulation library written in C that is supported on Windows, macOS, and Linux.",
"homepage": "https://github.com/zlib-ng/minizip-ng",
"supports": "!uwp",
diff --git a/versions/baseline.json b/versions/baseline.json
index 519781846..3cb2da8a0 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3946,7 +3946,7 @@
},
"minizip-ng": {
"baseline": "3.0.1",
- "port-version": 0
+ "port-version": 1
},
"mio": {
"baseline": "2019-02-10",
diff --git a/versions/m-/minizip-ng.json b/versions/m-/minizip-ng.json
index 9d9b0e3a2..880464914 100644
--- a/versions/m-/minizip-ng.json
+++ b/versions/m-/minizip-ng.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "c3f833fb14771ffd8f32496aa12035c86ab1cb9a",
+ "version": "3.0.1",
+ "port-version": 1
+ },
+ {
"git-tree": "0512bceae574c70ea907a8ebfc88709dc196164e",
"version": "3.0.1",
"port-version": 0