[zeromq | thrift] Replace deprecated cmake variables (microsoft#31104)

* replace obsolete functions * update version * Add option * update version * update variable * update version
sarvex · Apr 27, 2023 · 3f34cf3 · 3f34cf3
1 parent 71adb53
commit 3f34cf3
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 12 deletions.
diff --git a/ports/thrift/portfile.cmake b/ports/thrift/portfile.cmake
@@ -47,11 +47,11 @@ vcpkg_cmake_configure(
         -DBUILD_CPP=ON
         -DWITH_CPP=ON
         -DWITH_ZLIB=ON
-        -DCMAKE_FIND_PACKAGE_REQUIRE_ZLIB=TRUE
+        -DCMAKE_REQUIRE_FIND_PACKAGE_ZLIB=TRUE
         -DWITH_LIBEVENT=ON
-        -DCMAKE_FIND_PACKAGE_REQUIRE_Libevent=TRUE
+        -DCMAKE_REQUIRE_FIND_PACKAGE_Libevent=TRUE
         -DWITH_OPENSSL=ON
-        -DCMAKE_FIND_PACKAGE_REQUIRE_OpenSSL=TRUE
+        -DCMAKE_REQUIRE_FIND_PACKAGE_OpenSSL=TRUE
         -DBUILD_TUTORIALS=OFF
         -DFLEX_EXECUTABLE=${FLEX}
         -DWITH_QT5=OFF
@@ -64,9 +64,9 @@ vcpkg_cmake_configure(
     MAYBE_UNUSED_VARIABLES
         CMAKE_DISABLE_FIND_PACKAGE_GLIB
         CMAKE_DISABLE_FIND_PACKAGE_Gradle
-        CMAKE_FIND_PACKAGE_REQUIRE_Libevent
-        CMAKE_FIND_PACKAGE_REQUIRE_OpenSSL
-        CMAKE_FIND_PACKAGE_REQUIRE_ZLIB
+        CMAKE_REQUIRE_FIND_PACKAGE_Libevent
+        CMAKE_REQUIRE_FIND_PACKAGE_OpenSSL
+        CMAKE_REQUIRE_FIND_PACKAGE_ZLIB
 
 )
 
@@ -90,4 +90,4 @@ if ("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "static")
     file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin")
 endif()
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/ports/thrift/vcpkg.json b/ports/thrift/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "thrift",
   "version": "0.16.0",
+  "port-version": 1,
   "description": "Apache Thrift is a software project spanning a variety of programming languages and use cases. Our goal is to make reliable, performant communication and data serialization across languages as efficient and seamless as possible.",
   "homepage": "https://github.com/apache/thrift",
   "license": "Apache-2.0",

diff --git a/ports/zeromq/portfile.cmake b/ports/zeromq/portfile.cmake
@@ -34,8 +34,7 @@ vcpkg_cmake_configure(
         -DWITH_PERF_TOOL=OFF
         -DWITH_DOCS=OFF
         -DWITH_NSS=OFF
-        -DCMAKE_FIND_PACKAGE_REQUIRE_GnuTLS=ON
-        -DWITH_LIBBSD=OFF
+        -DCMAKE_REQUIRE_FIND_PACKAGE_GnuTLS=ON
         -DWITH_LIBSODIUM_STATIC=${BUILD_STATIC}
         ${FEATURE_OPTIONS}
         ${PLATFORM_OPTIONS}

diff --git a/ports/zeromq/vcpkg.json b/ports/zeromq/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "zeromq",
   "version-date": "2023-01-31",
-  "port-version": 2,
+  "port-version": 3,
   "description": "The ZeroMQ lightweight messaging kernel is a library which extends the standard socket interfaces with features traditionally provided by specialised messaging middleware products",
   "homepage": "https://github.com/zeromq/libzmq",
   "license": "LGPL-3.0-only",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -7854,7 +7854,7 @@
     },
     "thrift": {
       "baseline": "0.16.0",
-      "port-version": 0
+      "port-version": 1
     },
     "tidy-html5": {
       "baseline": "5.8.0",
@@ -8746,7 +8746,7 @@
     },
     "zeromq": {
       "baseline": "2023-01-31",
-      "port-version": 2
+      "port-version": 3
     },
     "zfp": {
       "baseline": "1.0.0",

diff --git a/versions/t-/thrift.json b/versions/t-/thrift.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "fc85618cd8a4849e400d28916b733f2426c9246d",
+      "version": "0.16.0",
+      "port-version": 1
+    },
     {
       "git-tree": "075afb4c9f18e75caa0eb4b07609324fa35b5ca5",
       "version": "0.16.0",

diff --git a/versions/z-/zeromq.json b/versions/z-/zeromq.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "3cbcf46fa4e8e9bdd5c586a15b9d4549497d8d6e",
+      "version-date": "2023-01-31",
+      "port-version": 3
+    },
     {
       "git-tree": "3926aa389f1ff91b3895fd51c502600effe6c4f2",
       "version-date": "2023-01-31",