[zlib] Fix wrapper message (#19999)

* Fix wrapper message * x-add-version * Ease wrapper warning condition * Avoid CMP0074 warning * Update versions * CR request: Modify validation * Update versions Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
microsoft · Oct 11, 2021 · 822eb4b · 822eb4b
1 parent 4ce045c
commit 822eb4b
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/ports/zlib/vcpkg-cmake-wrapper.cmake b/ports/zlib/vcpkg-cmake-wrapper.cmake
@@ -1,9 +1,8 @@
-set(ZLIB_ROOT "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}")
-find_path(ZLIB_INCLUDE_DIR NAMES zlib.h PATHS "${ZLIB_ROOT}/include" NO_DEFAULT_PATH)
-find_library(ZLIB_LIBRARY_RELEASE NAMES zlib  z PATHS "${ZLIB_ROOT}/lib" NO_DEFAULT_PATH)
-find_library(ZLIB_LIBRARY_DEBUG   NAMES zlibd z PATHS "${ZLIB_ROOT}/debug/lib" NO_DEFAULT_PATH)
-if(NOT ZLIB_INCLUDE_DIR OR NOT ZLIB_LIBRARY_RELEASE OR (NOT ZLIB_LIBRARY_DEBUG AND EXISTS "${ZLIB_ROOT}/debug/lib"))
-    message("Broken installation of vcpkg port zlib")
+find_path(ZLIB_INCLUDE_DIR NAMES zlib.h PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include" NO_DEFAULT_PATH)
+find_library(ZLIB_LIBRARY_RELEASE NAMES zlib  z PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib" NO_DEFAULT_PATH)
+find_library(ZLIB_LIBRARY_DEBUG   NAMES zlibd z PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib" NO_DEFAULT_PATH)
+if(NOT ZLIB_INCLUDE_DIR OR NOT (ZLIB_LIBRARY_RELEASE OR ZLIB_LIBRARY_DEBUG))
+    message(FATAL_ERROR "Broken installation of vcpkg port zlib")
 endif()
 if(CMAKE_VERSION VERSION_LESS 3.4)
     include(SelectLibraryConfigurations)

diff --git a/ports/zlib/vcpkg.json b/ports/zlib/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "zlib",
-  "version-string": "1.2.11",
-  "port-version": 12,
+  "version": "1.2.11",
+  "port-version": 13,
   "description": "A compression library",
   "homepage": "https://www.zlib.net/"
 }
diff --git a/versions/baseline.json b/versions/baseline.json
@@ -7250,7 +7250,7 @@
     },
     "zlib": {
       "baseline": "1.2.11",
-      "port-version": 12
+      "port-version": 13
     },
     "zlib-ng": {
       "baseline": "2.0.3",

diff --git a/versions/z-/zlib.json b/versions/z-/zlib.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "92cfe30c807d343c6359d272242f0765ad906740",
+      "version": "1.2.11",
+      "port-version": 13
+    },
     {
       "git-tree": "89dce3592d1a0a275009278b14bd85fd817b4ad9",
       "version-string": "1.2.11",