From bff77e9d600e6e6f58b43d047e3b2f145e364bd4 Mon Sep 17 00:00:00 2001
From: Michael Carroll <mjcarroll@intrinsic.ai>
Date: Fri, 28 Jul 2023 23:21:28 +0000
Subject: [PATCH] Use the messages from gz-sim

Signed-off-by: Michael Carroll <mjcarroll@intrinsic.ai>
---
 CMakeLists.txt                          | 9 +++++++++
 plugins/joystick/CMakeLists.txt         | 1 +
 plugins/websocket_server/CMakeLists.txt | 1 +
 3 files changed, 11 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f12380ee..42cdb97c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -59,8 +59,15 @@ else()
 endif()
 set(GZ_TOOLS_VER 2)
 
+#--------------------------------------
+# Find gz-fuel-tools
+gz_find_package(gz-fuel_tools9-msgs REQUIRED)
+gz_find_package(gz-fuel_tools9 REQUIRED)
+set(GZ_FUEL_TOOLS_VER ${gz-fuel_tools9_VERSION_MAJOR})
+
 #--------------------------------------
 # Find gz-transport
+gz_find_package(gz-transport13-msgs REQUIRED)
 gz_find_package(gz-transport13 REQUIRED)
 set(GZ_TRANSPORT_VER ${gz-transport13_VERSION_MAJOR})
 
@@ -76,6 +83,7 @@ set(GZ_MATH_VER ${gz-math7_VERSION_MAJOR})
 
 #--------------------------------------
 # Find gz-gui
+gz_find_package(gz-gui8-msgs)
 gz_find_package(gz-gui8 REQUIRED)
 set(GZ_GUI_VER ${gz-gui8_VERSION_MAJOR})
 gz_find_package (Qt5
@@ -88,6 +96,7 @@ gz_find_package (Qt5
 
 #--------------------------------------
 # Find gz-sim
+gz_find_package(gz-sim8-msgs)
 gz_find_package(gz-sim8 REQUIRED PRIVATE COMPONENTS gui)
 set(GZ_SIM_VER ${gz-sim8_VERSION_MAJOR})
 
diff --git a/plugins/joystick/CMakeLists.txt b/plugins/joystick/CMakeLists.txt
index 71a3f359..f4d4e3dd 100644
--- a/plugins/joystick/CMakeLists.txt
+++ b/plugins/joystick/CMakeLists.txt
@@ -9,6 +9,7 @@ target_link_libraries(${plugin}
     gz-math${GZ_MATH_VER}::gz-math${GZ_MATH_VER}
     gz-transport${GZ_TRANSPORT_VER}::core
     gz-plugin${GZ_PLUGIN_VER}::core
+    gz-sim${GZ_SIM_VER}::gz-sim${GZ_SIM_VER}-msgs
 )
 
 install (TARGETS ${plugin} DESTINATION ${GZ_LAUNCH_PLUGIN_INSTALL_PATH})
diff --git a/plugins/websocket_server/CMakeLists.txt b/plugins/websocket_server/CMakeLists.txt
index 8b32bd17..f199ad63 100644
--- a/plugins/websocket_server/CMakeLists.txt
+++ b/plugins/websocket_server/CMakeLists.txt
@@ -23,6 +23,7 @@ if (websockets_FOUND)
       gz-msgs${GZ_MSGS_VER}::core
       gz-plugin${GZ_PLUGIN_VER}::core
       gz-transport${GZ_TRANSPORT_VER}::core
+      gz-sim${GZ_SIM_VER}::gz-sim${GZ_SIM_VER}-msgs
   )
 
   install (TARGETS ${plugin} DESTINATION ${GZ_LAUNCH_PLUGIN_INSTALL_PATH})