Skip to content

Commit 8bf0e43

Browse files
bakpaulfredroy
authored andcommitted
Reoder inclusion of SofaCUDA plugin and fix name of Sofa.Qt target
1 parent 3db7d74 commit 8bf0e43

2 files changed

Lines changed: 7 additions & 5 deletions

File tree

applications/plugins/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ if(SOFA_BUILD_TESTS OR SOFA_BUILD_RELEASE_PACKAGE)
77
sofa_add_subdirectory(plugin SofaTest SofaTest)
88
endif()
99

10+
#Should be first to enable all CUDA based modules in plugins
11+
sofa_add_subdirectory(plugin SofaCUDA SofaCUDA)
12+
1013
sofa_add_subdirectory(plugin CollisionOBBCapsule CollisionOBBCapsule)
1114
sofa_add_subdirectory(plugin HeadlessRecorder HeadlessRecorder)
1215

@@ -59,7 +62,6 @@ if((${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU") AND (${CMAKE_SYSTEM_NAME} MATCHES "
5962
sofa_add_subdirectory(plugin SofaPardisoSolver SofaPardisoSolver) # SofaPardisoSolver is only available under linux with gcc
6063
endif()
6164

62-
sofa_add_subdirectory(plugin SofaCUDA SofaCUDA)
6365

6466
sofa_find_package(Sofa.GL QUIET)
6567
if(Sofa.GL_FOUND)

applications/plugins/SofaCUDA/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -267,8 +267,8 @@ if(Sofa.GUI_FOUND)
267267
list(APPEND SOURCE_FILES sofa/gpu/gui/CudaMouseInteraction.cpp)
268268
endif()
269269

270-
sofa_find_package(Sofa.GUI.Qt QUIET)
271-
if(Sofa.GUI.Qt_FOUND)
270+
sofa_find_package(Sofa.Qt QUIET)
271+
if(Sofa.Qt_FOUND)
272272
list(APPEND HEADER_FILES sofa/gpu/gui/CudaDataWidget.h)
273273
list(APPEND SOURCE_FILES sofa/gpu/gui/CudaDataWidget.cpp)
274274
endif()
@@ -379,8 +379,8 @@ if(Sofa.GUI_FOUND)
379379
endif()
380380

381381

382-
if(Sofa.GUI.Qt_FOUND)
383-
target_link_libraries(${PROJECT_NAME} Sofa.GUI.Qt)
382+
if(Sofa.Qt_FOUND)
383+
target_link_libraries(${PROJECT_NAME} Sofa.Qt)
384384
endif()
385385

386386
if(SofaValidation_FOUND)

0 commit comments

Comments
 (0)