From 6f5b20fba504ee4590316ed802c7f07227d9ee75 Mon Sep 17 00:00:00 2001
From: "veronica.knisley" <veronica.knisley@swri.org>
Date: Tue, 31 Aug 2021 16:28:03 -0500
Subject: [PATCH 1/4] Fixed exports

---
 multires_image/CMakeLists.txt                | 33 +++++++++++++++-----
 multires_image/cmake/export_components.cmake |  2 ++
 2 files changed, 28 insertions(+), 7 deletions(-)
 create mode 100644 multires_image/cmake/export_components.cmake

diff --git a/multires_image/CMakeLists.txt b/multires_image/CMakeLists.txt
index a1ac523..bce5807 100644
--- a/multires_image/CMakeLists.txt
+++ b/multires_image/CMakeLists.txt
@@ -51,7 +51,7 @@ add_definitions(-DWFlags=WindowFlags)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 # Build libtile_cache
-set(TILE_SRC_FILES 
+set(TILE_SRC_FILES
    src/tile.cpp
    src/tile_cache.cpp
    src/tile_set.cpp
@@ -59,7 +59,7 @@ set(TILE_SRC_FILES
 
 qt5_wrap_cpp(TILE_SRC_FILES include/${PROJECT_NAME}/tile_cache.h)
 
-add_library(${PROJECT_NAME} 
+add_library(${PROJECT_NAME}
   ${TILE_SRC_FILES}
 )
 target_include_directories(${PROJECT_NAME}
@@ -79,9 +79,9 @@ ament_target_dependencies(${PROJECT_NAME}
   gps_msgs
   mapviz
   pluginlib
-  rclcpp 
+  rclcpp
   tf2
-  swri_transform_util 
+  swri_transform_util
   swri_math_util
 )
 
@@ -123,7 +123,7 @@ ament_target_dependencies(multires_view_node
 )
 
 # Build mapviz plugin
-set(MAPVIZ_SRC_FILES 
+set(MAPVIZ_SRC_FILES
   src/${PROJECT_NAME}_plugin.cpp
   src/multires_view.cpp)
 qt5_wrap_ui(MAPVIZ_SRC_FILES src/multires_config.ui)
@@ -163,7 +163,26 @@ install(DIRECTORY launch
 
 pluginlib_export_plugin_description_file(mapviz mapviz_plugins.xml)
 
-ament_export_dependencies(${RUNTIME_DEPS} Qt)
+set(RUNTIME_DEPS
+  ament_cmake
+  cv_bridge
+  gps_msgs
+  mapviz
+  pluginlib
+  rclcpp
+  tf2
+  swri_transform_util
+  swri_math_util
+  Boost
+  OpenGL
+  OpenCV
+  Qt5Core
+  Qt5Gui
+  Qt5OpenGL
+  Qt5Widgets
+)
+
+ament_export_dependencies(${RUNTIME_DEPS})
 ament_export_include_directories(include)
 ament_export_libraries(${PROJECT_NAME})
-ament_package()
+ament_package(CONFIG_EXTRAS cmake/export_components.cmake)
diff --git a/multires_image/cmake/export_components.cmake b/multires_image/cmake/export_components.cmake
new file mode 100644
index 0000000..50af947
--- /dev/null
+++ b/multires_image/cmake/export_components.cmake
@@ -0,0 +1,2 @@
+find_package(OpenCV COMPONENTS core imgproc REQUIRED)
+find_package(Boost REQUIRED filesystem thread)
\ No newline at end of file

From 25e1f4534f1d9d207fe7903a5252ff63a9dd6098 Mon Sep 17 00:00:00 2001
From: "veronica.knisley" <veronica.knisley@swri.org>
Date: Tue, 31 Aug 2021 16:53:33 -0500
Subject: [PATCH 2/4] Removed OpenCV line from CONFIG_EXTRAS

---
 multires_image/cmake/export_components.cmake | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/multires_image/cmake/export_components.cmake b/multires_image/cmake/export_components.cmake
index 50af947..804b3ad 100644
--- a/multires_image/cmake/export_components.cmake
+++ b/multires_image/cmake/export_components.cmake
@@ -1,2 +1 @@
-find_package(OpenCV COMPONENTS core imgproc REQUIRED)
-find_package(Boost REQUIRED filesystem thread)
\ No newline at end of file
+find_package(Boost REQUIRED COMPONENTS filesystem thread)
\ No newline at end of file

From 82c47ca8d963a53eaadc7fb099d43429d9581ef8 Mon Sep 17 00:00:00 2001
From: "veronica.knisley" <veronica.knisley@swri.org>
Date: Wed, 1 Sep 2021 08:20:31 -0500
Subject: [PATCH 3/4] Formatting changes

---
 multires_image/CMakeLists.txt                | 14 +++++++-------
 multires_image/cmake/export_components.cmake |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/multires_image/CMakeLists.txt b/multires_image/CMakeLists.txt
index bce5807..ae62894 100644
--- a/multires_image/CMakeLists.txt
+++ b/multires_image/CMakeLists.txt
@@ -165,21 +165,21 @@ pluginlib_export_plugin_description_file(mapviz mapviz_plugins.xml)
 
 set(RUNTIME_DEPS
   ament_cmake
+  Boost
   cv_bridge
   gps_msgs
   mapviz
-  pluginlib
-  rclcpp
-  tf2
-  swri_transform_util
-  swri_math_util
-  Boost
-  OpenGL
   OpenCV
+  OpenGL
+  pluginlib
   Qt5Core
   Qt5Gui
   Qt5OpenGL
   Qt5Widgets
+  rclcpp
+  swri_math_util
+  swri_transform_util
+  tf2
 )
 
 ament_export_dependencies(${RUNTIME_DEPS})
diff --git a/multires_image/cmake/export_components.cmake b/multires_image/cmake/export_components.cmake
index 804b3ad..c480c1d 100644
--- a/multires_image/cmake/export_components.cmake
+++ b/multires_image/cmake/export_components.cmake
@@ -1 +1 @@
-find_package(Boost REQUIRED COMPONENTS filesystem thread)
\ No newline at end of file
+find_package(Boost REQUIRED COMPONENTS filesystem thread)

From 7deb37c3d1527f15e871fb1e2b3faa5b0db377b7 Mon Sep 17 00:00:00 2001
From: "veronica.knisley" <veronica.knisley@swri.org>
Date: Wed, 1 Sep 2021 08:27:16 -0500
Subject: [PATCH 4/4] Ordered remaining dependencies

---
 multires_image/CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/multires_image/CMakeLists.txt b/multires_image/CMakeLists.txt
index ae62894..35ac031 100644
--- a/multires_image/CMakeLists.txt
+++ b/multires_image/CMakeLists.txt
@@ -80,9 +80,9 @@ ament_target_dependencies(${PROJECT_NAME}
   mapviz
   pluginlib
   rclcpp
-  tf2
-  swri_transform_util
   swri_math_util
+  swri_transform_util
+  tf2
 )
 
 # Build libmultires_widget