From 176e76bfc15df4f1cf9264a357950b0eab5994e6 Mon Sep 17 00:00:00 2001
From: Windel Bouwman <windel@windel.nl>
Date: Tue, 21 Sep 2021 10:57:30 +0200
Subject: [PATCH 1/2] Fix logic when building without rviz.

---
 CMakeLists.txt | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e6ac4627..43bc6d6d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -79,9 +79,9 @@ IF(RTABMAP_GUI OR rviz_default_plugins_FOUND)
    ENDIF()   
 ENDIF(RTABMAP_GUI OR rviz_default_plugins_FOUND)
 
-find_package(rviz_common REQUIRED)
-find_package(rviz_rendering REQUIRED)
-find_package(rviz_default_plugins REQUIRED)
+find_package(rviz_common)
+find_package(rviz_rendering)
+find_package(rviz_default_plugins)
 
 
 #######################################
@@ -450,9 +450,11 @@ foreach(typesupport_impl ${typesupport_impls})
   rosidl_target_interfaces(rtabmap
     ${PROJECT_NAME}_msgs ${typesupport_impl}
   )
-  rosidl_target_interfaces(rtabmapviz
-    ${PROJECT_NAME}_msgs ${typesupport_impl}
-  )
+  IF(RTABMAP_GUI)
+    rosidl_target_interfaces(rtabmapviz
+      ${PROJECT_NAME}_msgs ${typesupport_impl}
+    )
+  ENDIF()
 endforeach()
 
 # If rviz is found, add plugins

From 1d60861ffbc4597d5b2eb05588d2d40ee9d1fd01 Mon Sep 17 00:00:00 2001
From: matlabbe <matlabbe@gmail.com>
Date: Tue, 21 Sep 2021 10:40:49 -0400
Subject: [PATCH 2/2] Updated rviz deps location in cmake

---
 CMakeLists.txt | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 43bc6d6d..2bce9fa5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -58,6 +58,11 @@ find_package(RTABMap 0.20.5 REQUIRED)
 find_package(Boost REQUIRED COMPONENTS system) # dependencies from PCL
 find_package(PCL 1.7 REQUIRED COMPONENTS kdtree) #This crashes idl generation if all components are found?! see https://github.com/ros2/rosidl/issues/402#issuecomment-565586908
 
+# optional
+find_package(rviz_common)
+find_package(rviz_rendering)
+find_package(rviz_default_plugins)
+
 #Qt stuff
 # If librtabmap_gui.so is found, rtabmapviz will be built
 # If rviz is found, plugins will be built
@@ -79,11 +84,6 @@ IF(RTABMAP_GUI OR rviz_default_plugins_FOUND)
    ENDIF()   
 ENDIF(RTABMAP_GUI OR rviz_default_plugins_FOUND)
 
-find_package(rviz_common)
-find_package(rviz_rendering)
-find_package(rviz_default_plugins)
-
-
 #######################################
 ## Declare ROS messages and services ##
 #######################################