From 8bf0e4347c26ff97fcc4e313ef700ef3d7320c56 Mon Sep 17 00:00:00 2001
From: Paul Baksic <paul.baksic@outlook.fr>
Date: Tue, 27 May 2025 11:47:01 +0200
Subject: [PATCH 1/3] Reoder inclusion of SofaCUDA plugin and fix name of
 Sofa.Qt target

---
 applications/plugins/CMakeLists.txt          | 4 +++-
 applications/plugins/SofaCUDA/CMakeLists.txt | 8 ++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/applications/plugins/CMakeLists.txt b/applications/plugins/CMakeLists.txt
index bcfe5807943..4c8ab325ae9 100644
--- a/applications/plugins/CMakeLists.txt
+++ b/applications/plugins/CMakeLists.txt
@@ -7,6 +7,9 @@ if(SOFA_BUILD_TESTS OR SOFA_BUILD_RELEASE_PACKAGE)
     sofa_add_subdirectory(plugin SofaTest SofaTest)
 endif()
 
+#Should be first to enable all CUDA based modules in plugins
+sofa_add_subdirectory(plugin SofaCUDA SofaCUDA)
+
 sofa_add_subdirectory(plugin CollisionOBBCapsule CollisionOBBCapsule)
 sofa_add_subdirectory(plugin HeadlessRecorder HeadlessRecorder)
 
@@ -59,7 +62,6 @@ if((${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU") AND (${CMAKE_SYSTEM_NAME} MATCHES "
     sofa_add_subdirectory(plugin SofaPardisoSolver SofaPardisoSolver) # SofaPardisoSolver is only available under linux with gcc
 endif()
 
-sofa_add_subdirectory(plugin SofaCUDA SofaCUDA)
 
 sofa_find_package(Sofa.GL QUIET)
 if(Sofa.GL_FOUND)
diff --git a/applications/plugins/SofaCUDA/CMakeLists.txt b/applications/plugins/SofaCUDA/CMakeLists.txt
index c409df1ee05..e6c0a2cbfbf 100644
--- a/applications/plugins/SofaCUDA/CMakeLists.txt
+++ b/applications/plugins/SofaCUDA/CMakeLists.txt
@@ -267,8 +267,8 @@ if(Sofa.GUI_FOUND)
     list(APPEND SOURCE_FILES sofa/gpu/gui/CudaMouseInteraction.cpp)
 endif()
 
-sofa_find_package(Sofa.GUI.Qt QUIET)
-if(Sofa.GUI.Qt_FOUND)
+sofa_find_package(Sofa.Qt QUIET)
+if(Sofa.Qt_FOUND)
     list(APPEND HEADER_FILES sofa/gpu/gui/CudaDataWidget.h)
     list(APPEND SOURCE_FILES sofa/gpu/gui/CudaDataWidget.cpp)
 endif()
@@ -379,8 +379,8 @@ if(Sofa.GUI_FOUND)
 endif()
 
 
-if(Sofa.GUI.Qt_FOUND)
-    target_link_libraries(${PROJECT_NAME} Sofa.GUI.Qt)
+if(Sofa.Qt_FOUND)
+    target_link_libraries(${PROJECT_NAME} Sofa.Qt)
 endif()
 
 if(SofaValidation_FOUND)

From ec3d40a1c1299a93304dfd9acd155d0daeda3cfe Mon Sep 17 00:00:00 2001
From: Paul Baksic <paul.baksic@outlook.fr>
Date: Tue, 27 May 2025 15:04:51 +0200
Subject: [PATCH 2/3] Fix includes and namespaces

---
 .../plugins/SofaCUDA/sofa/gpu/gui/CudaDataWidget.cpp        | 6 +++---
 applications/plugins/SofaCUDA/sofa/gpu/gui/CudaDataWidget.h | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/applications/plugins/SofaCUDA/sofa/gpu/gui/CudaDataWidget.cpp b/applications/plugins/SofaCUDA/sofa/gpu/gui/CudaDataWidget.cpp
index e49201e3cac..ab853256c43 100644
--- a/applications/plugins/SofaCUDA/sofa/gpu/gui/CudaDataWidget.cpp
+++ b/applications/plugins/SofaCUDA/sofa/gpu/gui/CudaDataWidget.cpp
@@ -22,9 +22,9 @@
 #include <sofa/gpu/gui/CudaDataWidget.h>
 #include <sofa/gpu/cuda/CudaTypes.h>
 #include <sofa/helper/Factory.inl>
-#include <sofa/gui/qt/DataWidget.h>
-#include <sofa/gui/qt/SimpleDataWidget.h>
-#include <sofa/gui/qt/TableDataWidget.h>
+#include <sofa/qt/DataWidget.h>
+#include <sofa/qt/SimpleDataWidget.h>
+#include <sofa/qt/TableDataWidget.h>
 
 namespace sofa::gui::qt
 {
diff --git a/applications/plugins/SofaCUDA/sofa/gpu/gui/CudaDataWidget.h b/applications/plugins/SofaCUDA/sofa/gpu/gui/CudaDataWidget.h
index 42ccf4b39e4..d2a87e13a7c 100644
--- a/applications/plugins/SofaCUDA/sofa/gpu/gui/CudaDataWidget.h
+++ b/applications/plugins/SofaCUDA/sofa/gpu/gui/CudaDataWidget.h
@@ -23,7 +23,7 @@
 #include <sofa/gpu/cuda/CudaTypes.h>
 #include <sofa/gui/qt/QModelViewTableDataContainer.h>
 
-namespace sofa::gui::qt
+namespace sofa::qt
 {
 ////////////////////////////////////////////////////////////////
 /// variable-sized vectors support

From 363b7f1014e5e472343db01f9f5fd5c5255a8ba2 Mon Sep 17 00:00:00 2001
From: Paul Baksic <paul.baksic@outlook.fr>
Date: Tue, 27 May 2025 15:14:41 +0200
Subject: [PATCH 3/3] Fix missing

---
 applications/plugins/SofaCUDA/sofa/gpu/gui/CudaDataWidget.cpp | 2 +-
 applications/plugins/SofaCUDA/sofa/gpu/gui/CudaDataWidget.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/applications/plugins/SofaCUDA/sofa/gpu/gui/CudaDataWidget.cpp b/applications/plugins/SofaCUDA/sofa/gpu/gui/CudaDataWidget.cpp
index ab853256c43..7c29315c1b5 100644
--- a/applications/plugins/SofaCUDA/sofa/gpu/gui/CudaDataWidget.cpp
+++ b/applications/plugins/SofaCUDA/sofa/gpu/gui/CudaDataWidget.cpp
@@ -26,7 +26,7 @@
 #include <sofa/qt/SimpleDataWidget.h>
 #include <sofa/qt/TableDataWidget.h>
 
-namespace sofa::gui::qt
+namespace sofa::qt
 {
 using sofa::helper::Creator;
 using namespace sofa::type;
diff --git a/applications/plugins/SofaCUDA/sofa/gpu/gui/CudaDataWidget.h b/applications/plugins/SofaCUDA/sofa/gpu/gui/CudaDataWidget.h
index d2a87e13a7c..3d535a69d9b 100644
--- a/applications/plugins/SofaCUDA/sofa/gpu/gui/CudaDataWidget.h
+++ b/applications/plugins/SofaCUDA/sofa/gpu/gui/CudaDataWidget.h
@@ -21,7 +21,7 @@
 ******************************************************************************/
 #pragma once
 #include <sofa/gpu/cuda/CudaTypes.h>
-#include <sofa/gui/qt/QModelViewTableDataContainer.h>
+#include <sofa/qt/QModelViewTableDataContainer.h>
 
 namespace sofa::qt
 {