From 2be701f902c54403f5f30caea89b076d4a41a08e Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Mon, 30 Jan 2023 10:58:24 -0500
Subject: [PATCH] platforms/nuttx: cmake debug pass GDB path and set RTOS
 plugin file extension

---
 platforms/nuttx/CMakeLists.txt       | 2 +-
 platforms/nuttx/Debug/launch.json.in | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/platforms/nuttx/CMakeLists.txt b/platforms/nuttx/CMakeLists.txt
index 3d5aed435c0..3926f237336 100644
--- a/platforms/nuttx/CMakeLists.txt
+++ b/platforms/nuttx/CMakeLists.txt
@@ -470,7 +470,7 @@ if(NOT NUTTX_DIR MATCHES "external")
 		)
 
 		# JLINK_RTOS_PATH used by launch.json.in
-		set(JLINK_RTOS_PATH ${NUTTX_DIR}/tools/jlink-nuttx)
+		set(JLINK_RTOS_PATH ${NUTTX_DIR}/tools/jlink-nuttx.so)
 	else()
 		set(JLINK_RTOS_PATH "")
 	endif()
diff --git a/platforms/nuttx/Debug/launch.json.in b/platforms/nuttx/Debug/launch.json.in
index 7548cabca20..56446dcc7bd 100644
--- a/platforms/nuttx/Debug/launch.json.in
+++ b/platforms/nuttx/Debug/launch.json.in
@@ -3,6 +3,7 @@
     "configurations": [
         {
             "name": "jlink (@PX4_BOARD@)",
+            "gdbPath": "@CMAKE_GDB@",
             "device": "@DEBUG_DEVICE@",
             "svdFile": "@DEBUG_SVD_FILE_PATH@",
             "rtos": "@JLINK_RTOS_PATH@",
@@ -24,6 +25,7 @@
         },
         {
             "name": "stlink (@PX4_BOARD@)",
+            "gdbPath": "@CMAKE_GDB@",
             "device": "@DEBUG_DEVICE@",
             "svdFile": "@DEBUG_SVD_FILE_PATH@",
             "executable": "${command:cmake.launchTargetPath}",
@@ -42,6 +44,7 @@
         },
         {
             "name": "blackmagic (@PX4_BOARD@)",
+            "gdbPath": "@CMAKE_GDB@",
             "device": "@DEBUG_DEVICE@",
             "svdFile": "@DEBUG_SVD_FILE_PATH@",
             "executable": "${command:cmake.launchTargetPath}",