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.

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

Jump to bottom

Fix qgl viewer examples #5

Merged
merged 4 commits into from
Jan 21, 2016
Merged

Fix qgl viewer examples #5

merged 4 commits into from
Jan 21, 2016

Conversation

radarsat1
Copy link
Contributor

Fix QGLViewer-based examples. Notable changes:

  • Order of some operations in exported CMakeLists.txt was changed to take libraries added by some options into account. Currently options WithQGLViewer and WithOpenGL specified in the example-specific .cmake file were ignored.
  • To avoid a segfault on Ubuntu 15.10, I found I needed to compile QGLViewer myself for Qt4, since the version installed by apt-get was compiled for Qt5. For this, I added the Siconos install path to the paths searched in FindQGLViewer.cmake.
  • There was an out-of-bounds assertion in SphereLDS.cpp, related to qMemory being checked after initialize, but before anything is inserted.
  • Had to "#include" SiconosKernel.hpp before SiconosBodies.hpp, otherwise code would not compile, complaining about parameter mismatch for the visitor pattern.

@radarsat1
Copy link
Contributor Author

Ah, just realized this is based on 3.8.x. Should I rebase it on master?

@radarsat1
Fix installed CMakeLists.txt to take project options into account.
7e43e26
@radarsat1
Update FindQGLViewer to also look in siconos install path.
059d429 
If QGLViewer is installed from source, it may need to be found there.
(For the moment the QGLViewer-based examples need QGLViewer compiled
for Qt4, whereas Ubuntu currently ships QGLViewer compiled for Qt5.)
@radarsat1
SphereLDS: fix assertion when qMemory was initialized but contains no…
7e2f5d0 
… entries.
@radarsat1
Fix QGLViewer-based examples.
26af8b2
@radarsat1
Copy link
Contributor Author

Just rebased it on master, seems to make more sense. Sorry about that.

vacary added a commit that referenced this pull request Jan 21, 2016
@vacary
Merge pull request #5 from radarsat1/fix_QGLViewer_examples
b7cbb43 
Fix qgl viewer examples
@vacary vacary merged commit b7cbb43 into siconos:master Jan 21, 2016
@xhub xhub mentioned this pull request Mar 13, 2016
Closed
siconos-team pushed a commit that referenced this pull request Oct 19, 2020
@vacary
[numerics] mark test #5 in fc3d_TEST_NSN_COLLECTION_2 as failed
5a8ab48 
	   Since commit 691b8a9 that renders
	   explicit the truncation in NM_zentry, the test # 5
	   (FC3D_NSN_AC, on ./data/KaplasTower-i1061-4.hdf5.dat)  is unstable
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@radarsat1 @vacary