Skip to content

Commit ea29c2d

Browse files
committed
Signed-off-by: Michael Carroll <mjcarroll@intrinsic.ai>
1 parent 2726159 commit ea29c2d

File tree

5 files changed

+35
-21
lines changed

5 files changed

+35
-21
lines changed

src/plugins/camera_fps/CMakeLists.txt

+15-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,18 @@
1-
gz_gui_add_plugin(CameraFps
2-
SOURCES
3-
CameraFps.cc
4-
QT_HEADERS
5-
CameraFps.hh
6-
PUBLIC_LINK_LIBS
1+
qt6_add_qml_module(CameraFps
2+
URI camera_fps
3+
VERSION 1.0
4+
SOURCES CameraFps.cc
5+
QML_FILES CameraFps.qml
6+
)
7+
8+
target_link_libraries(CameraFps PRIVATE
79
gz-rendering${GZ_RENDERING_VER}::gz-rendering${GZ_RENDERING_VER}
10+
gz-transport${GZ_TRANSPORT_VER}::gz-transport${GZ_TRANSPORT_VER}
11+
gz-plugin${GZ_PLUGIN_VER}::register
12+
Qt6::Gui
13+
Qt6::Widgets
14+
Qt6::Quick
15+
Qt6::QuickControls2
816
)
917

18+
install (TARGETS CameraFps DESTINATION ${GZ_GUI_PLUGIN_INSTALL_DIR})

src/plugins/camera_fps/CameraFps.qrc

-5
This file was deleted.
+16-9
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,18 @@
1-
gz_gui_add_plugin(CameraTracking
2-
SOURCES
3-
CameraTracking.cc
4-
QT_HEADERS
5-
CameraTracking.hh
6-
TEST_SOURCES
7-
# CameraTracking_TEST.cc
8-
PUBLIC_LINK_LIBS
1+
qt6_add_qml_module(CameraTracking
2+
URI camera_tracking
3+
VERSION 1.0
4+
SOURCES CameraTracking.cc
5+
QML_FILES CameraTracking.qml
6+
)
7+
8+
target_link_libraries(CameraTracking PRIVATE
99
gz-rendering${GZ_RENDERING_VER}::gz-rendering${GZ_RENDERING_VER}
10-
gz-common${GZ_COMMON_VER}::profiler
10+
gz-transport${GZ_TRANSPORT_VER}::gz-transport${GZ_TRANSPORT_VER}
11+
gz-plugin${GZ_PLUGIN_VER}::register
12+
Qt6::Gui
13+
Qt6::Widgets
14+
Qt6::Quick
15+
Qt6::QuickControls2
1116
)
17+
18+
install(TARGETS CameraTracking DESTINATION ${GZ_GUI_PLUGIN_INSTALL_DIR})

src/plugins/minimal_scene/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ set(SOURCES
1212
)
1313

1414
qt6_add_qml_module(MinimalScene
15-
URI MinimalScene
15+
URI minimal_scene
1616
VERSION 1.0
1717
SOURCES ${SOURCES}
1818
QML_FILES MinimalScene.qml

src/plugins/minimal_scene/MinimalScene.cc

+3
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,11 @@
5757
# include "MinimalSceneRhiOpenGL.hh"
5858
#endif
5959

60+
#if MINIMAL_SCENE_HAVE_VULKAN
6061
#include <QVulkanInstance>
6162
#include "MinimalSceneRhiVulkan.hh"
63+
#include <gz/rendering/RenderEngineVulkanExternalDeviceStructs.hh>
64+
#endif // MINIMAL_SCENE_HAVE_VULKAN
6265

6366
#if MINIMAL_SCENE_HAVE_METAL
6467
# include "MinimalSceneRhiMetal.hh"

0 commit comments

Comments
 (0)