Skip to content

Commit

Permalink
Merge branch 'master' into 202311_fix_warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
@hugtalbot
hugtalbot authored Nov 29, 2023
2 parents 80310ef + bc6c9db commit 70e4b05
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions applications/plugins/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ sofa_add_subdirectory(plugin CollisionOBBCapsule CollisionOBBCapsule)

sofa_add_subdirectory(directory SofaHighOrder SofaHighOrder EXTERNAL)

sofa_add_subdirectory(plugin CImgPlugin CImgPlugin ON) # ON by default and first as it is used by other plugins.
sofa_add_subdirectory(plugin CImgPlugin CImgPlugin) # ON by default and first as it is used by other plugins.
sofa_add_subdirectory(plugin ArticulatedSystemPlugin ArticulatedSystemPlugin ON)
sofa_add_subdirectory(plugin SofaEulerianFluid SofaEulerianFluid)
sofa_add_subdirectory(plugin SofaSphFluid SofaSphFluid)
sofa_add_subdirectory(plugin SofaDistanceGrid SofaDistanceGrid) # Depends on SofaMiscCollision
sofa_add_subdirectory(plugin SofaImplicitField SofaImplicitField)
sofa_add_subdirectory(plugin MultiThreading MultiThreading)
sofa_add_subdirectory(plugin MultiThreading MultiThreading ON)
sofa_add_subdirectory(plugin DiffusionSolver DiffusionSolver) # Depends on CImgPlugin
sofa_add_subdirectory(plugin image image) # Depends on CImgPlugin, DiffusionSolver, MultiThreading (soft)
sofa_add_subdirectory(plugin SofaNewmat SofaNewmat)
Expand Down

0 comments on commit 70e4b05

Please sign in to comment.