From 822eb4b4ce82d76fa5bcfa8f5774f47db4e01e8b Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Mon, 11 Oct 2021 19:21:07 +0200 Subject: [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 --- ports/zlib/vcpkg-cmake-wrapper.cmake | 11 +++++------ ports/zlib/vcpkg.json | 4 ++-- 2 files changed, 7 insertions(+), 8 deletions(-) (limited to 'ports/zlib') diff --git a/ports/zlib/vcpkg-cmake-wrapper.cmake b/ports/zlib/vcpkg-cmake-wrapper.cmake index 5060c5502..8624b7086 100644 --- 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 index fd85f6b12..4308e45a4 100644 --- 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/" } -- cgit v1.2.3