[Sofa.GUI.Qt] Add cmake module for QGLViewer #4290
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
olivier-roussel
changed the title
olivier-roussel
added
pr: fix
fredroy
added
pr: status wip
hugtalbot
added
the
pr: backport todo
olivier-roussel
removed
the
pr: status wip
|
[ci-build][with-all-tests] |
1 similar comment
|
[ci-build][with-all-tests] |
olivier-roussel
added
the
pr: status to review
fredroy
force-pushed
the
cmake-qglviewer
branch
from
5c839ab to
719827d
Compare
hugtalbot
reviewed
Nov 29, 2023
Co-authored-by: Hugo <hugo.talbot@sofa-framework.org>
fredroy
added
pr: status ready
bakpaul
pushed a commit
to bakpaul/sofa
that referenced
this pull request
Nov 29, 2023
* Add cmake module for QGLViewer * Support library name for apt packages * Fix qglviewer cmake finder module to first seach for a config cmake file. * Update cmake/Modules/FindQGLViewer.cmake Co-authored-by: Hugo <hugo.talbot@sofa-framework.org> --------- Co-authored-by: Frederick Roy <fredroy@users.noreply.github.com> Co-authored-by: Hugo <hugo.talbot@sofa-framework.org>
hugtalbot
added a commit
that referenced
this pull request
Dec 20, 2023
* Added projective and lagrangian suffix * Reported changes to Cuda plugin * Modify rest of the code to avoid warning from compatibility layer * Add compatibility layer for deprecated header in CUDA * add alias for compatibility layer in scene construction * Report name modification to all scenes * Revert Compat modification... * [LinearAlgera, Core] Fix linking with LTO on MacOS/Clang (#4293) Fix linking with LTO on macos * [LinearSolver] Remove CSparse-based linear solvers (#4258) * [LinearSolver.Direct] Remove CSparse based solvers * Remove csparse extlib * Fetchable CSparseSolvers plugin * Remove references of SparseLUSolver * Remove references to SparseCholeskySolver * Remove csparse * Try to fix on Linux * Update the compat * [LinearSolver.Direct] Remove CSparse based solvers * Fix direct solver * [GUI.Qt] Minor single-line cleaning (#4308) Co-authored-by: erik pernod <erik.pernod@gmail.com> * [Sofa.GUI.Qt] Add cmake module for QGLViewer (#4290) * Add cmake module for QGLViewer * Support library name for apt packages * Fix qglviewer cmake finder module to first seach for a config cmake file. * Update cmake/Modules/FindQGLViewer.cmake Co-authored-by: Hugo <hugo.talbot@sofa-framework.org> --------- Co-authored-by: Frederick Roy <fredroy@users.noreply.github.com> Co-authored-by: Hugo <hugo.talbot@sofa-framework.org> * [MultiThreading] Avoid Static Initialization Order Fiasco (#4307) * [Core] Minor clean of DefaultAnimationLoop (#4314) * Remove unlogical use of visitor * Delete unused methods * [LinearSystem] Speedup computation of Jacobian matrices (#4317) * [LinearSystem] Speedup computation of Jacobian matrices in case both mstates are the same * minor reformat to align calls to computeJacobiansFrom * [SofaCUDA] FIX compilation SofaCUDA along with SparseGrid with Cuda12 (#4319) * FIX compilation SofaCUDA along with SparseGrid with Cuda12 * Use a multiplication instead * [Common] Add message to make the fetch mechanism less hidden (#4310) * Add message to make it more clear * slight modifications to be even more clear and add an error the dependency cannot be met * [Collections] Remove reference to non-existing SofaSimulation (#4320) remove ref to non-existent sofasimu Co-authored-by: Paul Baksic <30337881+bakpaul@users.noreply.github.com> * Remove repeating preffix from projective constraints * Moved alias to original header * Changed deprecation date * add component change entry * Change name following discussion with Hugo * Change remaining scene with FixedConstraint * remove last occurences in py files * Changed the message display of sceneCheckUsingAlias when aliased component is in component change * Fix factory * Add alias creation when object in componentRenamed in factory * Remove precedently added aliases --------- Co-authored-by: Frederick Roy <fredroy@users.noreply.github.com> Co-authored-by: Alex Bilger <alxbilger@users.noreply.github.com> Co-authored-by: erik pernod <erik.pernod@gmail.com> Co-authored-by: Olivier Roussel <olivier.roussel@inria.fr> Co-authored-by: Hugo <hugo.talbot@sofa-framework.org>
fredroy
added a commit
to fredroy/sofa
that referenced
this pull request
Dec 21, 2023
) * Added projective and lagrangian suffix * Reported changes to Cuda plugin * Modify rest of the code to avoid warning from compatibility layer * Add compatibility layer for deprecated header in CUDA * add alias for compatibility layer in scene construction * Report name modification to all scenes * Revert Compat modification... * [LinearAlgera, Core] Fix linking with LTO on MacOS/Clang (sofa-framework#4293) Fix linking with LTO on macos * [LinearSolver] Remove CSparse-based linear solvers (sofa-framework#4258) * [LinearSolver.Direct] Remove CSparse based solvers * Remove csparse extlib * Fetchable CSparseSolvers plugin * Remove references of SparseLUSolver * Remove references to SparseCholeskySolver * Remove csparse * Try to fix on Linux * Update the compat * [LinearSolver.Direct] Remove CSparse based solvers * Fix direct solver * [GUI.Qt] Minor single-line cleaning (sofa-framework#4308) Co-authored-by: erik pernod <erik.pernod@gmail.com> * [Sofa.GUI.Qt] Add cmake module for QGLViewer (sofa-framework#4290) * Add cmake module for QGLViewer * Support library name for apt packages * Fix qglviewer cmake finder module to first seach for a config cmake file. * Update cmake/Modules/FindQGLViewer.cmake Co-authored-by: Hugo <hugo.talbot@sofa-framework.org> --------- Co-authored-by: Frederick Roy <fredroy@users.noreply.github.com> Co-authored-by: Hugo <hugo.talbot@sofa-framework.org> * [MultiThreading] Avoid Static Initialization Order Fiasco (sofa-framework#4307) * [Core] Minor clean of DefaultAnimationLoop (sofa-framework#4314) * Remove unlogical use of visitor * Delete unused methods * [LinearSystem] Speedup computation of Jacobian matrices (sofa-framework#4317) * [LinearSystem] Speedup computation of Jacobian matrices in case both mstates are the same * minor reformat to align calls to computeJacobiansFrom * [SofaCUDA] FIX compilation SofaCUDA along with SparseGrid with Cuda12 (sofa-framework#4319) * FIX compilation SofaCUDA along with SparseGrid with Cuda12 * Use a multiplication instead * [Common] Add message to make the fetch mechanism less hidden (sofa-framework#4310) * Add message to make it more clear * slight modifications to be even more clear and add an error the dependency cannot be met * [Collections] Remove reference to non-existing SofaSimulation (sofa-framework#4320) remove ref to non-existent sofasimu Co-authored-by: Paul Baksic <30337881+bakpaul@users.noreply.github.com> * Remove repeating preffix from projective constraints * Moved alias to original header * Changed deprecation date * add component change entry * Change name following discussion with Hugo * Change remaining scene with FixedConstraint * remove last occurences in py files * Changed the message display of sceneCheckUsingAlias when aliased component is in component change * Fix factory * Add alias creation when object in componentRenamed in factory * Remove precedently added aliases --------- Co-authored-by: Frederick Roy <fredroy@users.noreply.github.com> Co-authored-by: Alex Bilger <alxbilger@users.noreply.github.com> Co-authored-by: erik pernod <erik.pernod@gmail.com> Co-authored-by: Olivier Roussel <olivier.roussel@inria.fr> Co-authored-by: Hugo <hugo.talbot@sofa-framework.org>
hugtalbot
added a commit
to hugtalbot/sofa
that referenced
this pull request
Jan 16, 2024
) * Added projective and lagrangian suffix * Reported changes to Cuda plugin * Modify rest of the code to avoid warning from compatibility layer * Add compatibility layer for deprecated header in CUDA * add alias for compatibility layer in scene construction * Report name modification to all scenes * Revert Compat modification... * [LinearAlgera, Core] Fix linking with LTO on MacOS/Clang (sofa-framework#4293) Fix linking with LTO on macos * [LinearSolver] Remove CSparse-based linear solvers (sofa-framework#4258) * [LinearSolver.Direct] Remove CSparse based solvers * Remove csparse extlib * Fetchable CSparseSolvers plugin * Remove references of SparseLUSolver * Remove references to SparseCholeskySolver * Remove csparse * Try to fix on Linux * Update the compat * [LinearSolver.Direct] Remove CSparse based solvers * Fix direct solver * [GUI.Qt] Minor single-line cleaning (sofa-framework#4308) Co-authored-by: erik pernod <erik.pernod@gmail.com> * [Sofa.GUI.Qt] Add cmake module for QGLViewer (sofa-framework#4290) * Add cmake module for QGLViewer * Support library name for apt packages * Fix qglviewer cmake finder module to first seach for a config cmake file. * Update cmake/Modules/FindQGLViewer.cmake Co-authored-by: Hugo <hugo.talbot@sofa-framework.org> --------- Co-authored-by: Frederick Roy <fredroy@users.noreply.github.com> Co-authored-by: Hugo <hugo.talbot@sofa-framework.org> * [MultiThreading] Avoid Static Initialization Order Fiasco (sofa-framework#4307) * [Core] Minor clean of DefaultAnimationLoop (sofa-framework#4314) * Remove unlogical use of visitor * Delete unused methods * [LinearSystem] Speedup computation of Jacobian matrices (sofa-framework#4317) * [LinearSystem] Speedup computation of Jacobian matrices in case both mstates are the same * minor reformat to align calls to computeJacobiansFrom * [SofaCUDA] FIX compilation SofaCUDA along with SparseGrid with Cuda12 (sofa-framework#4319) * FIX compilation SofaCUDA along with SparseGrid with Cuda12 * Use a multiplication instead * [Common] Add message to make the fetch mechanism less hidden (sofa-framework#4310) * Add message to make it more clear * slight modifications to be even more clear and add an error the dependency cannot be met * [Collections] Remove reference to non-existing SofaSimulation (sofa-framework#4320) remove ref to non-existent sofasimu Co-authored-by: Paul Baksic <30337881+bakpaul@users.noreply.github.com> * Remove repeating preffix from projective constraints * Moved alias to original header * Changed deprecation date * add component change entry * Change name following discussion with Hugo * Change remaining scene with FixedConstraint * remove last occurences in py files * Changed the message display of sceneCheckUsingAlias when aliased component is in component change * Fix factory * Add alias creation when object in componentRenamed in factory * Remove precedently added aliases --------- Co-authored-by: Frederick Roy <fredroy@users.noreply.github.com> Co-authored-by: Alex Bilger <alxbilger@users.noreply.github.com> Co-authored-by: erik pernod <erik.pernod@gmail.com> Co-authored-by: Olivier Roussel <olivier.roussel@inria.fr> Co-authored-by: Hugo <hugo.talbot@sofa-framework.org>
bakpaul
added
pr: backport done
bakpaul
added a commit
to bakpaul/sofa
that referenced
this pull request
Feb 23, 2024
) * Added projective and lagrangian suffix * Reported changes to Cuda plugin * Modify rest of the code to avoid warning from compatibility layer * Add compatibility layer for deprecated header in CUDA * add alias for compatibility layer in scene construction * Report name modification to all scenes * Revert Compat modification... * [LinearAlgera, Core] Fix linking with LTO on MacOS/Clang (sofa-framework#4293) Fix linking with LTO on macos * [LinearSolver] Remove CSparse-based linear solvers (sofa-framework#4258) * [LinearSolver.Direct] Remove CSparse based solvers * Remove csparse extlib * Fetchable CSparseSolvers plugin * Remove references of SparseLUSolver * Remove references to SparseCholeskySolver * Remove csparse * Try to fix on Linux * Update the compat * [LinearSolver.Direct] Remove CSparse based solvers * Fix direct solver * [GUI.Qt] Minor single-line cleaning (sofa-framework#4308) Co-authored-by: erik pernod <erik.pernod@gmail.com> * [Sofa.GUI.Qt] Add cmake module for QGLViewer (sofa-framework#4290) * Add cmake module for QGLViewer * Support library name for apt packages * Fix qglviewer cmake finder module to first seach for a config cmake file. * Update cmake/Modules/FindQGLViewer.cmake Co-authored-by: Hugo <hugo.talbot@sofa-framework.org> --------- Co-authored-by: Frederick Roy <fredroy@users.noreply.github.com> Co-authored-by: Hugo <hugo.talbot@sofa-framework.org> * [MultiThreading] Avoid Static Initialization Order Fiasco (sofa-framework#4307) * [Core] Minor clean of DefaultAnimationLoop (sofa-framework#4314) * Remove unlogical use of visitor * Delete unused methods * [LinearSystem] Speedup computation of Jacobian matrices (sofa-framework#4317) * [LinearSystem] Speedup computation of Jacobian matrices in case both mstates are the same * minor reformat to align calls to computeJacobiansFrom * [SofaCUDA] FIX compilation SofaCUDA along with SparseGrid with Cuda12 (sofa-framework#4319) * FIX compilation SofaCUDA along with SparseGrid with Cuda12 * Use a multiplication instead * [Common] Add message to make the fetch mechanism less hidden (sofa-framework#4310) * Add message to make it more clear * slight modifications to be even more clear and add an error the dependency cannot be met * [Collections] Remove reference to non-existing SofaSimulation (sofa-framework#4320) remove ref to non-existent sofasimu Co-authored-by: Paul Baksic <30337881+bakpaul@users.noreply.github.com> * Remove repeating preffix from projective constraints * Moved alias to original header * Changed deprecation date * add component change entry * Change name following discussion with Hugo * Change remaining scene with FixedConstraint * remove last occurences in py files * Changed the message display of sceneCheckUsingAlias when aliased component is in component change * Fix factory * Add alias creation when object in componentRenamed in factory * Remove precedently added aliases --------- Co-authored-by: Frederick Roy <fredroy@users.noreply.github.com> Co-authored-by: Alex Bilger <alxbilger@users.noreply.github.com> Co-authored-by: erik pernod <erik.pernod@gmail.com> Co-authored-by: Olivier Roussel <olivier.roussel@inria.fr> Co-authored-by: Hugo <hugo.talbot@sofa-framework.org>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR adds a CMake find module for the QGLViewer used in SOFA.GUI.Qt.
The behavior here (already in place) is to look for an external package of QGLViewer and if not found, use the embeded code of QGLViewer (which is linked dynamically).
I may have missed something but it seems that QGLViewer does not provide CMake config files (neither from source, or in package managers such as APT, Conda and vcpkg). And as SOFA was not including a CMake module for it, there was no chance for it to be found externally.
Then, this should not break current behavior but just fix the possibility to use an external GLViewer package.
By submitting this pull request, I acknowledge that
I have read, understand, and agree SOFA Developer Certificate of Origin (DCO).
Reviewers will merge this pull-request only if