Skip to content

[SofaCUDA] Reorder inclusion of SofaCUDA plugin and fix name of Sofa.Qt target #5509

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fredroy merged 5 commits into from
Jun 3, 2025
Merged

[SofaCUDA] Reorder inclusion of SofaCUDA plugin and fix name of Sofa.Qt target #5509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8bf0e43
Reoder inclusion of SofaCUDA plugin and fix name of Sofa.Qt target
bakpaul May 27, 2025
ec3d40a
Fix includes and namespaces
bakpaul May 27, 2025
363b7f1
Fix missing
bakpaul May 27, 2025
459b885
Merge branch 'master' of github.com:sofa-framework/sofa into 25_05_fi…
bakpaul Jun 2, 2025
2bb2489
Merge branch 'master' into 25_05_fix_cuda_in_tree_compilation
hugtalbot Jun 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion applications/plugins/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -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)
Expand Down
10 changes: 5 additions & 5 deletions applications/plugins/SofaCUDA/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,10 +283,10 @@ if(Sofa.GUI_FOUND)
list(APPEND SOURCE_FILES ${SOFACUDACORE_SOURCE_DIR}/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 ${SOFACUDACORE_SOURCE_DIR}/sofa/gpu/gui/CudaDataWidget.h)
list(APPEND SOURCE_FILES${SOFACUDACORE_SOURCE_DIR}/ sofa/gpu/gui/CudaDataWidget.cpp)
list(APPEND SOURCE_FILES ${SOFACUDACORE_SOURCE_DIR}/sofa/gpu/gui/CudaDataWidget.cpp)
endif()

sofa_find_package(SofaValidation QUIET)
Expand Down Expand Up @@ -388,8 +388,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)
Expand Down
8 changes: 4 additions & 4 deletions applications/plugins/SofaCUDA/src/sofa/gpu/gui/CudaDataWidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@
#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
namespace sofa::qt
{
using sofa::helper::Creator;
using namespace sofa::type;
Expand Down
4 changes: 2 additions & 2 deletions applications/plugins/SofaCUDA/src/sofa/gpu/gui/CudaDataWidget.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
******************************************************************************/
#pragma once
#include <sofa/gpu/cuda/CudaTypes.h>
#include <sofa/gui/qt/QModelViewTableDataContainer.h>
#include <sofa/qt/QModelViewTableDataContainer.h>

namespace sofa::gui::qt
namespace sofa::qt
{
////////////////////////////////////////////////////////////////
/// variable-sized vectors support
Expand Down