From 4850b7caa3bdbde6b0c6cce47dd44cea35a93071 Mon Sep 17 00:00:00 2001
From: Wolfgang Merkt <w.merkt@gmail.com>
Date: Mon, 18 Jul 2022 17:22:36 +0100
Subject: [PATCH 1/2] Update cmake module

---
 cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake b/cmake
index 63a6aaf17..9d20c6f79 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 63a6aaf17f0cc2b32fd41cfa012aabbac3cb007e
+Subproject commit 9d20c6f79ef9f717ea9e8c549ec2d239b8d406a3

From 7029e0ad87b49f8f6d4166bb36cd04a1819ff7c6 Mon Sep 17 00:00:00 2001
From: Wolfgang Merkt <w.merkt@gmail.com>
Date: Mon, 18 Jul 2022 17:23:02 +0100
Subject: [PATCH 2/2] Colcon integration: AMENT_PREFIX_PATH and PYTHONPATH

---
 CMakeLists.txt | 4 ++++
 colcon.pkg     | 6 ++++++
 2 files changed, 10 insertions(+)
 create mode 100644 colcon.pkg

diff --git a/CMakeLists.txt b/CMakeLists.txt
index acf59fde0..4ef0048bd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -282,3 +282,7 @@ INSTALL(FILES package.xml DESTINATION share/${PROJECT_NAME})
 # Allows Colcon to find non-Ament packages when using workspace underlays
 file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/share/ament_index/resource_index/packages/${PROJECT_NAME} "")
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/share/ament_index/resource_index/packages/${PROJECT_NAME} DESTINATION share/ament_index/resource_index/packages)
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/share/${PROJECT_NAME}/hook/ament_prefix_path.dsv "prepend-non-duplicate;AMENT_PREFIX_PATH;")
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/share/${PROJECT_NAME}/hook/ament_prefix_path.dsv DESTINATION share/${PROJECT_NAME}/hook)
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/share/${PROJECT_NAME}/hook/python_path.dsv "prepend-non-duplicate;PYTHONPATH;${PYTHON_SITELIB}")
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/share/${PROJECT_NAME}/hook/python_path.dsv DESTINATION share/${PROJECT_NAME}/hook)
diff --git a/colcon.pkg b/colcon.pkg
new file mode 100644
index 000000000..eeb8d2334
--- /dev/null
+++ b/colcon.pkg
@@ -0,0 +1,6 @@
+{
+    "hooks": [
+        "share/hpp-fcl/hook/ament_prefix_path.dsv",
+        "share/hpp-fcl/hook/python_path.dsv"
+    ]
+}
\ No newline at end of file