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

Build improvements #504

Merged
merged 5 commits into from Nov 29, 2019

Conversation

@rpavlik
Copy link
Contributor

rpavlik commented Nov 26, 2019

The first two commits make the build system more resilient. The remaining commits disable on Linux some bundled "external" libraries that are often available from Linux distributions:

  • Eigen3
  • GLEW
  • lib3ds
  • openctm
  • bzip2

Probably could be simplified more, but I'm not a qmake expert.

@rpavlik

This comment has been minimized.

Copy link
Contributor Author

rpavlik commented Nov 27, 2019

OK I pushed a new change that adds some config options. Travis now will build using the bundled libs again, since I haven't added those options to the travis config yet.

Something like this will maximally use system libs (testing on Debian Buster):

qmake CONFIG+=system_eigen3 CONFIG+=system_glew CONFIG+=system_lib3ds CONFIG+=system_openctm CONFIG+=system_bzip2 meshlab_full.pro
@alemuntoni

This comment has been minimized.

Copy link
Member

alemuntoni commented Nov 27, 2019

Hi, thank you for this pull request!
Since Travis is failing now, can you update the Travis script such that qmake is called with the config system arguments you suggested (on Linux environment)?
Meshlab should compile also without installing eigen from apt (and then using the one inside vcg), but apparently it is failing on including it...

Specifically, lib3ds, openctm, bzip2, Eigen, and GLEW
@rpavlik rpavlik force-pushed the rpavlik:build-improvements branch from f7da565 to f44858e Nov 27, 2019
@rpavlik

This comment has been minimized.

Copy link
Contributor Author

rpavlik commented Nov 27, 2019

OK, I cleaned up and squashed those commits, and fixed the issue that was breaking travis (hopefully) - I can now build either with the bundled Eigen, etc. or the system ones on my debian machine, and Travis will test both configurations.

I've also documented how to use this system-library capability in the readme file.

@rpavlik

This comment has been minimized.

Copy link
Contributor Author

rpavlik commented Nov 27, 2019

ok, guess I have some more tweaks to make

@rpavlik rpavlik force-pushed the rpavlik:build-improvements branch from bcb4dad to c61384e Nov 27, 2019
@rpavlik

This comment has been minimized.

Copy link
Contributor Author

rpavlik commented Nov 27, 2019

OK, this seems to be working now, in both modes (with/without bundled deps)

@alemuntoni alemuntoni merged commit 3c6d6bf into cnr-isti-vclab:master Nov 29, 2019
2 checks passed
2 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@rpavlik rpavlik deleted the rpavlik:build-improvements branch Nov 29, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.