Skip to content
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.

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

[Config] Fix QGLViewer find module on windows #4611

Conversation

olivier-roussel
Copy link
Contributor

The conda package of qglviewer on windows produces libraries prefixed QGLViewer2 instead of QGLViewer. This seems limited to the conda package on windows (does not appear on other OS). Also, the only other libqglviewer package I know for windows, which is vcpkg, is not affected neither (library is properly named QGLViewer).
I think this should be corrected on conda package side, but meanwhile it ever happens one day, this would solve the problem for now.


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

  • it builds with SUCCESS for all platforms on the CI.
  • it does not generate new warnings.
  • it does not generate new unit test failures.
  • it does not generate new scene test failures.
  • it does not break API compatibility.
  • it is more than 1 week old (or has fast-merge label).

hugtalbot and others added 28 commits February 19, 2024 09:11
* [all] Fix warnings

* revert change on scenes wrongly committed

* Apply suggestions from code review

Co-authored-by: Alex Bilger <alxbilger@users.noreply.github.com>

* [all] Fix warnings

* Fix runtime error due to useless destructor

* take reviews into account: d_nbThreads back to int

---------

Co-authored-by: Alex Bilger <alxbilger@users.noreply.github.com>
* [Haption] Partially fix the plugin

CMake passes with SOFA-NG
Fix some types and includes due to changes from SOFA-NG

The plugin still does not compile

* Add a readme file
…sofa-framework#4242)

* Check that triangles index match the size of the triangleAroundVertexArray (Like it is done in EdgeSetTopologyContainer for EdgeAroundVertexArray)

* Fix some typos
* Add option git_ref to specify which branch to checkout

* forgot about the projects
…a-framework#4471)

* find_package gtest or fetch gtest ; and use it for testing.Remove usage of the old one

* fix compilation for newer gtest

* remove source of the embedded gtest

* update cmake message for SOFA_ALLOW_FETCH_DEPENDENCIES

* fix define

* apply suggestion by using GTest ; and remove CONFIG keyword

* use cmake 3.20 version for gtest modules
* Replace tinyxml by external tinyxml2.

* Customize TinyXML2 cmake module to use a find _package or fetch content mechanism.

* Replace find or fetch mechanism by classical cmake find module.

* Fix missed cmake target name change

* Handle error if tinyxml2 package not found but required

* Fix compilation with Dump Visitor activated

* Install libtinyxml

* FIX error checking

* Actually fix...

* FIX error loading VTU xml files

* FIX scene test

---------

Co-authored-by: bakpaul <bakpaul@hotmail.fr>
Co-authored-by: Paul Baksic <30337881+bakpaul@users.noreply.github.com>
* [VolumetricRendering] Fix the compilation

But scenes crash

* reflect changes from datatype change for vec3state (sofa-framework#6)

* fix lots of stuff (sofa-framework#7)

---------

Co-authored-by: Frederick Roy <fredroy@users.noreply.github.com>
Co-authored-by: Hugo <hugo.talbot@sofa-framework.org>
* Add relative path to references files into regression-tests files

* fix typo
* workaround when using volumetricrendering in batch mode

* fix and clean computebbox
* Link dynamically with embedded metis to comply conda-forge rules

* export all symbols (for MSVC)

* Use external 5.1.0 metis or fallback to embedded code linked dynamically

* fix comments in metis cmake module

* ADD find or fetch mechanism

* Remove embeded metis and put linkage to private

* Fix metis dependency but still not the best fix

* test

* Put back public linkage

* Revert "Put back public linkage"

This reverts commit 71baa47.

* Clean

* cleaning sofa-framework#2

* Use SOFA_ALLOW_FETCH_DEPENDENCIES cmake option for metis

* Add missing CImg to list of fetchable dependencies in doc

* Update applications/plugins/SofaMatrix/CMakeLists.txt

Co-authored-by: Frederick Roy <fredroy@users.noreply.github.com>

---------

Co-authored-by: Frederick Roy <froy@lnrobo.com>
Co-authored-by: Paul Baksic <30337881+bakpaul@users.noreply.github.com>
Co-authored-by: bakpaul <bakpaul@hotmail.fr>
Co-authored-by: Paul Baksic <paul.baksic@outlook.fr>
Co-authored-by: Frederick Roy <fredroy@users.noreply.github.com>
…4525)

Fix tinyXML install for windows

Co-authored-by: Hugo <hugo.talbot@sofa-framework.org>
* Add cxxopts cmake find module

* fix case where cmake config file for cxxopts was found
Install FindTinyXML2 for OOT compilation using the binaries
Remove error and send warning when cxxopt is found but version mismatch
…e_to_tinyxml_guiqt

[GUI.qt] Set link to tinyxml2 to PRIVATE and fix config file
…#4564)

* Remove error and send warning when cxxopt is found but version mismatch

* [all] Install FindTinyXML2  (sofa-framework#4545)

Install FindTinyXML2 for OOT compilation using the binaries

* [Visual] Fix cmake config  (sofa-framework#4555)

Remove the find_package(tinyxml2 REQUIRED) because the link is private

* Set link to tinyxml2 to PRIVATE and fix config file

* Check if version is specified before checking the version to avoid errors

* Set cxx_opts_FOUND when the version is not required

---------

Co-authored-by: Hugo <hugo.talbot@sofa-framework.org>
…4570)

* handle cmake config files starting with uppercase for case sensitive OS

* fix case where config cmake file is used and version defined by config files

* do not fail on error if wrong version is installed and allow fetching
* Create real imported target instead o interface

* test macos install tinyxml2

* fix tinyxml2 rpath

---------

Co-authored-by: Hugo <hugo.talbot@sofa-framework.org>
@olivier-roussel olivier-roussel added pr: fix Fix a bug pr: fast merge Minor change that can be merged without waiting for the 7 review days labels Mar 21, 2024
@olivier-roussel olivier-roussel added the pr: status to review To notify reviewers to review this pull-request label Mar 21, 2024
@olivier-roussel olivier-roussel changed the base branch from v23.12 to master March 21, 2024 16:03
@hugtalbot hugtalbot removed the pr: status to review To notify reviewers to review this pull-request label Aug 7, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pr: fast merge Minor change that can be merged without waiting for the 7 review days pr: fix Fix a bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants