microsoft · talregev · Feb 22, 2025 · Feb 22, 2025 · Feb 25, 2025 · Feb 27, 2025
diff --git a/ports/gz-cmake3/dependencies.patch → ports/gz-cmake/dependencies.patch b/ports/gz-cmake3/dependencies.patch → ports/gz-cmake/dependencies.patch
diff --git a/ports/gz-cmake/portfile.cmake b/ports/gz-cmake/portfile.cmake
@@ -0,0 +1,17 @@
+string(REGEX MATCH "^[1-9]+" VERSION_MAJOR ${VERSION})
+string(REGEX MATCH "^gz-([a-z]+)" MATCHED_VALUE ${PORT})
+set(PACKAGE_NAME ${CMAKE_MATCH_1})
+
+ignition_modular_library(
+    NAME ${PACKAGE_NAME}
+    REF ${PORT}${VERSION_MAJOR}_${VERSION}
+    VERSION ${VERSION}
+    SHA512 30cf5aa69674bdc1a99762fc45d134b99da5e2faf846749392697ae41463a5304a43022bb0c2ca1b373af4171135d686fdd736573fe6e1cc26dc2cecc8333e69
+    PATCHES
+        dependencies.patch
+)
+
+
+
+file(COPY "${CURRENT_PORT_DIR}/vcpkg" DESTINATION "${CURRENT_PACKAGES_DIR}/share/cmake/${PORT}/${PACKAGE_NAME}${VERSION_MAJOR}")
+configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY)
diff --git a/ports/gz-cmake3/usage → ports/gz-cmake/usage b/ports/gz-cmake3/usage → ports/gz-cmake/usage
diff --git a/ports/gz-cmake/vcpkg.json b/ports/gz-cmake/vcpkg.json
@@ -0,0 +1,13 @@
+{
+  "name": "gz-cmake",
+  "version": "3.4.1",
+  "description": "CMake helper functions for building robotic applications",
+  "homepage": "https://ignitionrobotics.org/libs/cmake",
+  "license": null,
+  "dependencies": [
+    {
+      "name": "ignition-modularscripts",
+      "host": true
+    }
+  ]
+}
diff --git a/ports/gz-cmake3/vcpkg/GTS.cmake → ports/gz-cmake/vcpkg/GTS.cmake b/ports/gz-cmake3/vcpkg/GTS.cmake → ports/gz-cmake/vcpkg/GTS.cmake
diff --git a/ports/gz-cmake3/vcpkg/TINYXML2.cmake → ports/gz-cmake/vcpkg/TINYXML2.cmake b/ports/gz-cmake3/vcpkg/TINYXML2.cmake → ports/gz-cmake/vcpkg/TINYXML2.cmake
diff --git a/ports/gz-cmake3/portfile.cmake b/ports/gz-cmake3/portfile.cmake
@@ -1,13 +1 @@
-set(PACKAGE_NAME cmake)
-
-ignition_modular_library(
-    NAME ${PACKAGE_NAME}
-    REF ${PORT}_${VERSION}
-    VERSION ${VERSION}
-    SHA512 30cf5aa69674bdc1a99762fc45d134b99da5e2faf846749392697ae41463a5304a43022bb0c2ca1b373af4171135d686fdd736573fe6e1cc26dc2cecc8333e69
-    PATCHES
-        dependencies.patch
-)
-
-file(COPY "${CURRENT_PORT_DIR}/vcpkg" DESTINATION "${CURRENT_PACKAGES_DIR}/share/cmake/gz-cmake3/cmake3")
-configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY)
+set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
diff --git a/ports/gz-cmake3/vcpkg.json b/ports/gz-cmake3/vcpkg.json
@@ -1,14 +1,11 @@
 {
   "name": "gz-cmake3",
   "version": "3.4.1",
-  "port-version": 5,
+  "port-version": 6,
   "description": "CMake helper functions for building robotic applications",
   "homepage": "https://ignitionrobotics.org/libs/cmake",
   "license": null,
   "dependencies": [
-    {
-      "name": "ignition-modularscripts",
-      "host": true
-    }
+    "gz-cmake"
   ]
 }
diff --git a/ports/gz-common5/003-include-chrono.patch → ports/gz-common/003-include-chrono.patch b/ports/gz-common5/003-include-chrono.patch → ports/gz-common/003-include-chrono.patch
diff --git a/ports/gz-common5/gz_remotery_vis.patch → ports/gz-common/gz_remotery_vis.patch b/ports/gz-common5/gz_remotery_vis.patch → ports/gz-common/gz_remotery_vis.patch
diff --git a/ports/gz-common/portfile.cmake b/ports/gz-common/portfile.cmake
@@ -0,0 +1,29 @@
+string(REGEX MATCH "^[1-9]+" VERSION_MAJOR ${VERSION})
+string(REGEX MATCH "^gz-([a-z]+)" MATCHED_VALUE ${PORT})
+set(PACKAGE_NAME ${CMAKE_MATCH_1})
+
+ignition_modular_library(
+   NAME ${PACKAGE_NAME}
+   REF ${PORT}${VERSION_MAJOR}_${VERSION}
+   VERSION ${VERSION}
+   SHA512 40db4747db743005d7c43ca25cfe93cf68ee19201abcb165e72de37708b92fd88553b11520c420db33b37f4cab7e01e4d79c91c5dc0485146b7156284b8baaee
+   OPTIONS 
+      -DBUILD_TESTING=OFF
+      -DUSE_EXTERNAL_TINYXML2=ON
+      "-DPKG_CONFIG_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/pkgconf/pkgconf${VCPKG_HOST_EXECUTABLE_SUFFIX}"
+   PATCHES
+      gz_remotery_vis.patch
+      003-include-chrono.patch
+)
+
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}${VERSION_MAJOR}-graphics/${PORT}${VERSION_MAJOR}-graphics-config.cmake" "find_package(GTS "
+"# Ensure that consumers get a pkg-config tool which is needed for GTS
+set(PKG_CONFIG_EXECUTABLE \"\${CMAKE_CURRENT_LIST_DIR}/../../../${HOST_TRIPLET}/tools/pkgconf/pkgconf${VCPKG_HOST_EXECUTABLE_SUFFIX}\" CACHE STRING vcpkg)
+find_package(GTS "
+IGNORE_UNCHANGED)
+
+foreach(component IN ITEMS av events geospatial graphics io profiler testing)
+   if(NOT EXISTS "${CURRENT_PACKAGES_DIR}/share/${PORT}${VERSION_MAJOR}-${component}/${PORT}${VERSION_MAJOR}-${component}-config.cmake")
+      message(FATAL_ERROR "Failed to install component ${component}. Check configuration logs for missing dependencies.")
+   endif()
+endforeach()
diff --git a/ports/gz-common/vcpkg.json b/ports/gz-common/vcpkg.json
@@ -0,0 +1,34 @@
+{
+  "name": "gz-common",
+  "version": "5.4.1",
+  "description": "Common libraries for robotics applications",
+  "homepage": "https://ignitionrobotics.org/libs/common",
+  "license": "Apache-2.0",
+  "dependencies": [
+    "assimp",
+    {
+      "name": "dlfcn-win32",
+      "platform": "windows | uwp"
+    },
+    "ffmpeg",
+    "freeimage",
+    "gdal",
+    "gts",
+    "gz-cmake",
+    "gz-math",
+    {
+      "name": "ignition-modularscripts",
+      "host": true
+    },
+    {
+      "name": "libuuid",
+      "platform": "!windows & !osx"
+    },
+    {
+      "name": "pkgconf",
+      "host": true,
+      "default-features": false
+    },
+    "tinyxml2"
+  ]
+}
diff --git a/ports/gz-common5/portfile.cmake b/ports/gz-common5/portfile.cmake
@@ -1,27 +1 @@
-set(PACKAGE_NAME common)
-
-ignition_modular_library(
-   NAME ${PACKAGE_NAME}
-   REF ${PORT}_${VERSION}
-   VERSION ${VERSION}
-   SHA512 40db4747db743005d7c43ca25cfe93cf68ee19201abcb165e72de37708b92fd88553b11520c420db33b37f4cab7e01e4d79c91c5dc0485146b7156284b8baaee
-   OPTIONS 
-      -DBUILD_TESTING=OFF
-      -DUSE_EXTERNAL_TINYXML2=ON
-      "-DPKG_CONFIG_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/pkgconf/pkgconf${VCPKG_HOST_EXECUTABLE_SUFFIX}"
-   PATCHES
-      gz_remotery_vis.patch
-      003-include-chrono.patch
-)
-
-vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/gz-common5-graphics/gz-common5-graphics-config.cmake" "find_package(GTS "
-"# Ensure that consumers get a pkg-config tool which is needed for GTS
-set(PKG_CONFIG_EXECUTABLE \"\${CMAKE_CURRENT_LIST_DIR}/../../../${HOST_TRIPLET}/tools/pkgconf/pkgconf${VCPKG_HOST_EXECUTABLE_SUFFIX}\" CACHE STRING vcpkg)
-find_package(GTS "
-IGNORE_UNCHANGED)
-
-foreach(component IN ITEMS av events geospatial graphics io profiler testing)
-   if(NOT EXISTS "${CURRENT_PACKAGES_DIR}/share/${PORT}-${component}/${PORT}-${component}-config.cmake")
-      message(FATAL_ERROR "Failed to install component ${component}. Check configuration logs for missing dependencies.")
-   endif()
-endforeach()
+set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
diff --git a/ports/gz-common5/vcpkg.json b/ports/gz-common5/vcpkg.json
@@ -1,35 +1,11 @@
 {
   "name": "gz-common5",
   "version": "5.4.1",
-  "port-version": 3,
+  "port-version": 4,
   "description": "Common libraries for robotics applications",
   "homepage": "https://ignitionrobotics.org/libs/common",
   "license": "Apache-2.0",
   "dependencies": [
-    "assimp",
-    {
-      "name": "dlfcn-win32",
-      "platform": "windows | uwp"
-    },
-    "ffmpeg",
-    "freeimage",
-    "gdal",
-    "gts",
-    "gz-cmake3",
-    "gz-math7",
-    {
-      "name": "ignition-modularscripts",
-      "host": true
-    },
-    {
-      "name": "libuuid",
-      "platform": "!windows & !osx"
-    },
-    {
-      "name": "pkgconf",
-      "host": true,
-      "default-features": false
-    },
-    "tinyxml2"
+    "gz-common"
   ]
 }
diff --git a/ports/gz-fuel-tools/portfile.cmake b/ports/gz-fuel-tools/portfile.cmake
@@ -0,0 +1,13 @@
+string(REGEX MATCH "^[1-9]+" VERSION_MAJOR ${VERSION})
+string(REGEX MATCH "^gz-([a-z]+)" MATCHED_VALUE ${PORT})
+set(PACKAGE_NAME ${CMAKE_MATCH_1})
+
+ignition_modular_library(
+   NAME ${PACKAGE_NAME}
+   REF ${PORT}${VERSION_MAJOR}_${VERSION}
+   VERSION ${VERSION}
+   SHA512 6a31719441c7ea835007d82b6aea99b10fa124ebad71683b8c1c58c41b435d4801e016464dc30d760cc9464e642dab4ff910375f5244ebf7c565845174e65cbf
+   OPTIONS 
+   PATCHES
+      remove_docs.patch
+)
diff --git a/ports/gz-fuel-tools8/remove_docs.patch → ports/gz-fuel-tools/remove_docs.patch b/ports/gz-fuel-tools8/remove_docs.patch → ports/gz-fuel-tools/remove_docs.patch
diff --git a/ports/gz-fuel-tools/vcpkg.json b/ports/gz-fuel-tools/vcpkg.json
@@ -0,0 +1,21 @@
+{
+  "name": "gz-fuel-tools",
+  "version": "8.1.0",
+  "description": "Tools for using fuel API to download robot models",
+  "homepage": "https://gazebosim.org/libs/fuel_tools",
+  "license": null,
+  "dependencies": [
+    "curl",
+    "gz-cmake",
+    "gz-common",
+    "gz-msgs",
+    {
+      "name": "ignition-modularscripts",
+      "host": true
+    },
+    "jsoncpp",
+    "libyaml",
+    "libzip",
+    "tinyxml2"
+  ]
+}
diff --git a/ports/gz-fuel-tools8/portfile.cmake b/ports/gz-fuel-tools8/portfile.cmake
@@ -1,11 +1 @@
-set(PACKAGE_NAME fuel-tools)
-
-ignition_modular_library(
-   NAME ${PACKAGE_NAME}
-   REF ${PORT}_${VERSION}
-   VERSION ${VERSION}
-   SHA512 6a31719441c7ea835007d82b6aea99b10fa124ebad71683b8c1c58c41b435d4801e016464dc30d760cc9464e642dab4ff910375f5244ebf7c565845174e65cbf
-   OPTIONS 
-   PATCHES
-      remove_docs.patch
-)
+set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
diff --git a/ports/gz-fuel-tools8/vcpkg.json b/ports/gz-fuel-tools8/vcpkg.json
@@ -1,21 +1,11 @@
 {
   "name": "gz-fuel-tools8",
   "version": "8.1.0",
+  "port-version": 1,
   "description": "Tools for using fuel API to download robot models",
   "homepage": "https://gazebosim.org/libs/fuel_tools",
   "license": null,
   "dependencies": [
-    "curl",
-    "gz-cmake3",
-    "gz-common5",
-    "gz-msgs9",
-    {
-      "name": "ignition-modularscripts",
-      "host": true
-    },
-    "jsoncpp",
-    "libyaml",
-    "libzip",
-    "tinyxml2"
+    "gz-fuel-tools"
   ]
 }
diff --git a/ports/gz-gui7/dependencies.patch → ports/gz-gui/dependencies.patch b/ports/gz-gui7/dependencies.patch → ports/gz-gui/dependencies.patch
diff --git a/ports/gz-gui/portfile.cmake b/ports/gz-gui/portfile.cmake
@@ -0,0 +1,30 @@
+string(REGEX MATCH "^[1-9]+" VERSION_MAJOR ${VERSION})
+string(REGEX MATCH "^gz-([a-z]+)" MATCHED_VALUE ${PORT})
+set(PACKAGE_NAME ${CMAKE_MATCH_1})
+
+ignition_modular_library(
+   NAME ${PACKAGE_NAME}
+   REF ${PORT}${VERSION_MAJOR}_${VERSION}
+   VERSION ${VERSION}
+   SHA512 29f37a31bbf90dd35f37e80053c1aff9fb404b7a09c8c10e640da505cc6261387e6ce77e3bf379a911e6131c684f866cf1ef8d83777112b3c7f148b1f95cc72f
+   OPTIONS 
+   PATCHES
+      dependencies.patch
+)
+
+if(VCPKG_TARGET_IS_WINDOWS)   
+   file(GLOB plugins "${CURRENT_PACKAGES_DIR}/lib/${PORT}-${VERSION_MAJOR}/plugins/*.dll")
+   if (NOT plugins STREQUAL "")
+      file(COPY ${plugins} DESTINATION "${CURRENT_PACKAGES_DIR}/engine-plugins/")
+      file(REMOVE ${plugins})
+   endif()
+
+   file(GLOB plugins_debug "${CURRENT_PACKAGES_DIR}/debug/lib/${PORT}-${VERSION_MAJOR}/plugins/*.dll")
+   if (NOT plugins_debug STREQUAL "")
+      file(COPY ${plugins_debug} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/engine-plugins/")
+      file(REMOVE ${plugins_debug})
+   endif()
+
+    # Lacking pc files for Qt
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig")
+endif()
diff --git a/ports/gz-gui/vcpkg.json b/ports/gz-gui/vcpkg.json
@@ -0,0 +1,32 @@
+{
+  "name": "gz-gui",
+  "version": "7.2.1",
+  "description": "Gazebo GUI builds on top of Qt to provide widgets which are useful when developing robotics applications, such as a 3D view, plots, dashboard, etc, and can be used together in a convenient unified interface.",
+  "homepage": "https://gazebosim.org/libs/gui",
+  "license": "Apache-2.0",
+  "dependencies": [
+    "gz-cmake",
+    "gz-common",
+    "gz-math",
+    "gz-msgs",
+    "gz-plugin",
+    "gz-rendering",
+    "gz-transport",
+    "gz-utils",
+    {
+      "name": "ignition-modularscripts",
+      "host": true
+    },
+    "protobuf",
+    {
+      "name": "qt5-base",
+      "default-features": false
+    },
+    {
+      "name": "qt5-quickcontrols2",
+      "default-features": false
+    },
+    "sdformat",
+    "tinyxml2"
+  ]
+}
diff --git a/ports/gz-gui7/portfile.cmake b/ports/gz-gui7/portfile.cmake
@@ -1,28 +1 @@
-set(PACKAGE_NAME gui)
-
-ignition_modular_library(
-   NAME ${PACKAGE_NAME}
-   REF ${PORT}_${VERSION}
-   VERSION ${VERSION}
-   SHA512 29f37a31bbf90dd35f37e80053c1aff9fb404b7a09c8c10e640da505cc6261387e6ce77e3bf379a911e6131c684f866cf1ef8d83777112b3c7f148b1f95cc72f
-   OPTIONS 
-   PATCHES
-      dependencies.patch
-)
-
-if(VCPKG_TARGET_IS_WINDOWS)   
-   file(GLOB plugins "${CURRENT_PACKAGES_DIR}/lib/gz-gui-7/plugins/*.dll")
-   if (NOT plugins STREQUAL "")
-      file(COPY ${plugins} DESTINATION "${CURRENT_PACKAGES_DIR}/engine-plugins/")
-      file(REMOVE ${plugins})
-   endif()
-
-   file(GLOB plugins_debug "${CURRENT_PACKAGES_DIR}/debug/lib/gz-gui-7/plugins/*.dll")
-   if (NOT plugins_debug STREQUAL "")
-      file(COPY ${plugins_debug} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/engine-plugins/")
-      file(REMOVE ${plugins_debug})
-   endif()
-
-    # Lacking pc files for Qt
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig")
-endif()
+set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
diff --git a/ports/gz-gui7/vcpkg.json b/ports/gz-gui7/vcpkg.json
@@ -1,32 +1,11 @@
 {
   "name": "gz-gui7",
   "version": "7.2.1",
+  "port-version": 1,
   "description": "Gazebo GUI builds on top of Qt to provide widgets which are useful when developing robotics applications, such as a 3D view, plots, dashboard, etc, and can be used together in a convenient unified interface.",
   "homepage": "https://gazebosim.org/libs/gui",
   "license": "Apache-2.0",
   "dependencies": [
-    "gz-cmake3",
-    "gz-common5",
-    "gz-math7",
-    "gz-msgs9",
-    "gz-plugin2",
-    "gz-rendering7",
-    "gz-transport12",
-    "gz-utils2",
-    {
-      "name": "ignition-modularscripts",
-      "host": true
-    },
-    "protobuf",
-    {
-      "name": "qt5-base",
-      "default-features": false
-    },
-    {
-      "name": "qt5-quickcontrols2",
-      "default-features": false
-    },
-    "sdformat13",
-    "tinyxml2"
+    "gz-gui"
   ]
 }