Skip to content

Commit

Permalink
[minizip-ng] made cmake installs relative (#17685)
Browse files Browse the repository at this point in the history
* [minizip-ng] made cmake installs relative

* [minizip-ng] update version

* Update versions/m-/minizip-ng.json

* formated ports/minzip-ng/vcpkg.json

Co-authored-by: Jack·Boos·Yu <[email protected]>
  • Loading branch information
prateek9623 and JackBoosY authored May 18, 2021
1 parent c1d7e28 commit f68f30c
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 13 deletions.
10 changes: 5 additions & 5 deletions ports/minizip-ng/Modify-header-file-path.patch
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ index 9ef8023..ec1ee55 100644
+++ 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(INSTALL_BIN_DIR ${CMAKE_INSTALL_BINDIR} CACHE PATH "Installation directory for executables")
set(INSTALL_LIB_DIR ${CMAKE_INSTALL_LIBDIR} CACHE PATH "Installation directory for libraries")
-set(INSTALL_INC_DIR ${CMAKE_INSTALL_INCLUDEDIR} CACHE PATH "Installation directory for headers")
+set(INSTALL_INC_DIR ${CMAKE_INSTALL_INCLUDEDIR}/minizip-ng CACHE PATH "Installation directory for headers")
set(INSTALL_MAN_DIR ${CMAKE_INSTALL_MANDIR} CACHE PATH "Installation directory for manual pages")

set(STDLIB_DEF)
7 changes: 4 additions & 3 deletions ports/minizip-ng/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO zlib-ng/minizip-ng
REF 3.0.1
SHA512 98c9bdcea79a88a2dd69cec6c49f8565edf78ab9cddbf0e85e08b049b300b187f176bf57d5a894bf777bec0a097e46ecc05f78dab9cd5726fd473ffd8718dce0
REF 3.0.2
SHA512 eee4d35d273ab0a32972b119c8faabd8c242e2d9f506fab0dd21fdd24c78b932c01bf7f15e9cf7c452776fc4c2e27a5ff09e376adb7a706336d11114929182fc
HEAD_REF master
PATCHES Modify-header-file-path.patch
PATCHES
Modify-header-file-path.patch
)

vcpkg_cmake_configure(
Expand Down
3 changes: 1 addition & 2 deletions ports/minizip-ng/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "minizip-ng",
"version": "3.0.1",
"port-version": 1,
"version": "3.0.2",
"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",
Expand Down
6 changes: 3 additions & 3 deletions versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -3993,8 +3993,8 @@
"port-version": 8
},
"minizip-ng": {
"baseline": "3.0.1",
"port-version": 1
"baseline": "3.0.2",
"port-version": 0
},
"mio": {
"baseline": "2019-02-10",
Expand Down Expand Up @@ -6701,4 +6701,4 @@
"port-version": 1
}
}
}
}
5 changes: 5 additions & 0 deletions versions/m-/minizip-ng.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "9c49a3f4d6bb3e5173cf17e1539b439dcf4bf6ea",
"version": "3.0.2",
"port-version": 0
},
{
"git-tree": "c3f833fb14771ffd8f32496aa12035c86ab1cb9a",
"version": "3.0.1",
Expand Down

0 comments on commit f68f30c

Please sign in to comment.