@wip

Signed-off-by: Michael Carroll <mjcarroll@intrinsic.ai>
gazebosim · Nov 13, 2023 · ea29c2d · ea29c2d
1 parent 2726159
commit ea29c2d
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 21 deletions.
diff --git a/src/plugins/camera_fps/CMakeLists.txt b/src/plugins/camera_fps/CMakeLists.txt
@@ -1,9 +1,18 @@
-gz_gui_add_plugin(CameraFps
-  SOURCES
-    CameraFps.cc
-  QT_HEADERS
-    CameraFps.hh
-  PUBLIC_LINK_LIBS
+qt6_add_qml_module(CameraFps
+  URI camera_fps
+  VERSION 1.0
+  SOURCES CameraFps.cc
+  QML_FILES CameraFps.qml
+)
+
+target_link_libraries(CameraFps PRIVATE
    gz-rendering${GZ_RENDERING_VER}::gz-rendering${GZ_RENDERING_VER}
+   gz-transport${GZ_TRANSPORT_VER}::gz-transport${GZ_TRANSPORT_VER}
+   gz-plugin${GZ_PLUGIN_VER}::register
+   Qt6::Gui
+   Qt6::Widgets
+   Qt6::Quick
+   Qt6::QuickControls2
 )
 
+install (TARGETS CameraFps DESTINATION ${GZ_GUI_PLUGIN_INSTALL_DIR})
diff --git a/src/plugins/camera_fps/CameraFps.qrc b/src/plugins/camera_fps/CameraFps.qrc
diff --git a/src/plugins/camera_tracking/CMakeLists.txt b/src/plugins/camera_tracking/CMakeLists.txt
@@ -1,11 +1,18 @@
-gz_gui_add_plugin(CameraTracking
-  SOURCES
-    CameraTracking.cc
-  QT_HEADERS
-    CameraTracking.hh
-  TEST_SOURCES
-    # CameraTracking_TEST.cc
-  PUBLIC_LINK_LIBS
+qt6_add_qml_module(CameraTracking
+  URI camera_tracking
+  VERSION 1.0
+  SOURCES CameraTracking.cc
+  QML_FILES CameraTracking.qml
+)
+
+target_link_libraries(CameraTracking PRIVATE
    gz-rendering${GZ_RENDERING_VER}::gz-rendering${GZ_RENDERING_VER}
-   gz-common${GZ_COMMON_VER}::profiler
+   gz-transport${GZ_TRANSPORT_VER}::gz-transport${GZ_TRANSPORT_VER}
+   gz-plugin${GZ_PLUGIN_VER}::register
+   Qt6::Gui
+   Qt6::Widgets
+   Qt6::Quick
+   Qt6::QuickControls2
 )
+
+install(TARGETS CameraTracking DESTINATION ${GZ_GUI_PLUGIN_INSTALL_DIR})
diff --git a/src/plugins/minimal_scene/CMakeLists.txt b/src/plugins/minimal_scene/CMakeLists.txt
@@ -12,7 +12,7 @@ set(SOURCES
 )
 
 qt6_add_qml_module(MinimalScene
-  URI MinimalScene
+  URI minimal_scene
   VERSION 1.0
   SOURCES ${SOURCES}
   QML_FILES MinimalScene.qml

diff --git a/src/plugins/minimal_scene/MinimalScene.cc b/src/plugins/minimal_scene/MinimalScene.cc
@@ -57,8 +57,11 @@
 #  include "MinimalSceneRhiOpenGL.hh"
 #endif
 
+#if MINIMAL_SCENE_HAVE_VULKAN
 #include <QVulkanInstance>
 #include "MinimalSceneRhiVulkan.hh"
+#include <gz/rendering/RenderEngineVulkanExternalDeviceStructs.hh>
+#endif  // MINIMAL_SCENE_HAVE_VULKAN
 
 #if MINIMAL_SCENE_HAVE_METAL
 #  include "MinimalSceneRhiMetal.hh"