[zeroc-ice] Added icelocatordiscovery feature (microsoft#33487)

myd7349 · Sep 1, 2023 · 09076d1 · 09076d1
1 parent f4a2113
commit 09076d1
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 2 deletions.
diff --git a/ports/zeroc-ice/portfile.cmake b/ports/zeroc-ice/portfile.cmake
@@ -135,6 +135,12 @@ if("icediscovery" IN_LIST FEATURES)
     vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "IceDiscovery")
 endif()
 
+# IceLocatorDiscovery
+if("icelocatordiscovery" IN_LIST FEATURES)
+    vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++11\\icelocatordiscovery++11")
+    vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "IceLocatorDiscovery")
+endif()
+
 if(NOT VCPKG_TARGET_IS_WINDOWS)
     # Clean up for the first round (important for install --editable)
     vcpkg_execute_build_process(

diff --git a/ports/zeroc-ice/vcpkg.json b/ports/zeroc-ice/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "zeroc-ice",
   "version": "3.7.9",
-  "port-version": 2,
+  "port-version": 3,
   "maintainers": "Benjamin Oldenburg <[email protected]>",
   "description": "Comprehensive RPC framework with support for C++, CSharp, Java, JavaScript, Python and more.",
   "homepage": "https://github.com/zeroc-ice/ice",
@@ -106,6 +106,20 @@
         }
       ]
     },
+    "icelocatordiscovery": {
+      "description": "IceLocatorDiscovery",
+      "dependencies": [
+        {
+          "name": "zeroc-ice",
+          "features": [
+            "glacier2lib",
+            "iceboxlib",
+            "icessl",
+            "icestormlib"
+          ]
+        }
+      ]
+    },
     "icessl": {
       "description": "IceSSL",
       "dependencies": [

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -9062,7 +9062,7 @@
     },
     "zeroc-ice": {
       "baseline": "3.7.9",
-      "port-version": 2
+      "port-version": 3
     },
     "zeromq": {
       "baseline": "2023-06-20",

diff --git a/versions/z-/zeroc-ice.json b/versions/z-/zeroc-ice.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "45f338a327c4b8ea7eb16fc81e650cd0f999449c",
+      "version": "3.7.9",
+      "port-version": 3
+    },
     {
       "git-tree": "dc07eee81cdf5c66efc83d606c635e722ef23d39",
       "version": "3.7.9",