[cmake] Fix dependency zstd

scripts/test_ports/cmake/CONTROL

@@ -1,5 +1,6 @@
 Source: cmake
 Version: 3.18.1
+Port-Version: 1
 Build-Depends: qt5-base, qt5-winextras (windows), bzip2, expat, jsoncpp, liblzma, zlib, zstd, libarchive, curl, libuv, nghttp2
 Homepage: https://cmake.org/
 Description: CMake is an open-source, cross-platform family of tools designed to build, test and package software. 

scripts/test_ports/cmake/fix-dependency-zstd.patch

@@ -0,0 +1,27 @@
+diff --git a/Utilities/cmlibarchive/CMakeLists.txt b/Utilities/cmlibarchive/CMakeLists.txt
+index bfcaf30..567f0a0 100644
+--- a/Utilities/cmlibarchive/CMakeLists.txt
++++ b/Utilities/cmlibarchive/CMakeLists.txt
+@@ -621,15 +621,13 @@ ENDIF(LZ4_FOUND)
+ # Find Zstd
+ #
+ IF(ENABLE_ZSTD)
+-  IF (ZSTD_INCLUDE_DIR)
+-    # Already in cache, be silent
+-    SET(ZSTD_FIND_QUIETLY TRUE)
+-  ENDIF (ZSTD_INCLUDE_DIR)
+-
+-  FIND_PATH(ZSTD_INCLUDE_DIR zstd.h)
+-  FIND_LIBRARY(ZSTD_LIBRARY NAMES zstd libzstd)
+-  INCLUDE(FindPackageHandleStandardArgs)
+-  FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZSTD DEFAULT_MSG ZSTD_LIBRARY ZSTD_INCLUDE_DIR)
++  FIND_PACKAGE(zstd CONFIG REQUIRED)
++  SET(HAVE_LIBZSTD 1)
++  IF(TARGET zstd::libzstd_shared)
++    SET(ZSTD_LIBRARY zstd::libzstd_shared)
++  ELSE(TARGET zstd::libzstd_shared)
++    SET(ZSTD_LIBRARY zstd::libzstd_static)  
++  ENDIF(TARGET zstd::libzstd_shared)
+ ELSE(ENABLE_ZSTD)
+   SET(ZSTD_FOUND FALSE) # Override cached value
+ ENDIF(ENABLE_ZSTD)

scripts/test_ports/cmake/portfile.cmake

@@ -8,6 +8,7 @@ vcpkg_from_gitlab(
     SHA512
         7874b26adb739649ea3a8c2d8701b44ea348d5d6387e0e2a3dd87494dfeae62084593f88f46d53a161ac24c46a7712489621213b61315593df4dc2ccc728084b
     HEAD_REF master
+    PATCHES fix-dependency-zstd.patch
 )
 
 vcpkg_configure_cmake(