This commit is contained in:
talregev 2023-11-09 21:28:51 +02:00 коммит произвёл GitHub
Родитель 69600a0dfe
Коммит f5c5b8ddbb
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
8 изменённых файлов: 104 добавлений и 3 удалений

Просмотреть файл

@ -0,0 +1,22 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -80,13 +80,17 @@
set(GZ_TOOLS_VER 2)
#--------------------------------------
# Find QT
+set(qt_pkgconfig "Qt5Core Qt5Quick Qt5QuickControls2 Qt5Widgets")
+if (WIN32)
+set(qt_pkgconfig "")
+endif()
gz_find_package (Qt5
COMPONENTS
Core
Quick
QuickControls2
Widgets
REQUIRED
- PKGCONFIG "Qt5Core Qt5Quick Qt5QuickControls2 Qt5Widgets"
+ PKGCONFIG ${qt_pkgconfig}
)

Просмотреть файл

@ -0,0 +1,28 @@
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()

32
ports/gz-gui7/vcpkg.json Normal file
Просмотреть файл

@ -0,0 +1,32 @@
{
"name": "gz-gui7",
"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-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"
]
}

Просмотреть файл

@ -13,13 +13,13 @@ ignition_modular_library(
if(VCPKG_TARGET_IS_WINDOWS)
file(GLOB plugins "${CURRENT_PACKAGES_DIR}/lib/gz-physics-6/engine-plugins/*.dll")
if (NOT plugins STREQUAL "")
file(COPY ${plugins} DESTINATION "${CURRENT_PACKAGES_DIR}/bin/engine-plugins/")
file(COPY ${plugins} DESTINATION "${CURRENT_PACKAGES_DIR}/engine-plugins/")
file(REMOVE ${plugins})
endif()
file(GLOB plugins_debug "${CURRENT_PACKAGES_DIR}/debug/lib/gz-physics-6/engine-plugins/*.dll")
if (NOT plugins_debug STREQUAL "")
file(COPY ${plugins_debug} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin/engine-plugins/")
file(COPY ${plugins_debug} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/engine-plugins/")
file(REMOVE ${plugins_debug})
endif()
endif()

Просмотреть файл

@ -1,6 +1,7 @@
{
"name": "gz-physics6",
"version": "6.5.1",
"port-version": 1,
"description": "component of Gazebo, provides an abstract physics interface designed to support simulation and rapid development of robot applications.",
"homepage": "https://gazebosim.org/libs/physics",
"license": "Apache-2.0",

Просмотреть файл

@ -3188,6 +3188,10 @@
"baseline": "8.1.0",
"port-version": 0
},
"gz-gui7": {
"baseline": "7.2.1",
"port-version": 0
},
"gz-math7": {
"baseline": "7.3.0",
"port-version": 0
@ -3198,7 +3202,7 @@
},
"gz-physics6": {
"baseline": "6.5.1",
"port-version": 0
"port-version": 1
},
"gz-plugin2": {
"baseline": "2.0.1",

9
versions/g-/gz-gui7.json Normal file
Просмотреть файл

@ -0,0 +1,9 @@
{
"versions": [
{
"git-tree": "3fc2d2bd35c8d9c5dad86739f113b952cb65913a",
"version": "7.2.1",
"port-version": 0
}
]
}

Просмотреть файл

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "f21733a38332420967e218df27d7adfc125c6f07",
"version": "6.5.1",
"port-version": 1
},
{
"git-tree": "9e84a89c5e37806e67295d51b6bd1ec565ccaede",
"version": "6.5.1",