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

[CImgPlugin] Add fetchable CImg and remove embedded cimg #4357

Merged
merged 14 commits into from
Dec 21, 2023

Conversation

fredroy
Copy link
Contributor

@fredroy fredroy commented Dec 13, 2023

Based on:

Remove the (really old) cimg version and fetch it from cimg git repository (or let the user set-up its own cimg version.
Not a requirement for #4221 anyway (header-only are acceptable)

  • +200k lines removed
  • fix compilation for newer version of cimg
  • learnt how to export a symbol without the declspec shenanigans on MSVC 🫠 As the current cimg.h file has been modified to add a export symbol macro...)

(compiles with the cimg provided by Ubuntu v22.04 and latest cimg on Windows)


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).

@fredroy fredroy added pr: status to review To notify reviewers to review this pull-request pr: clean Cleaning the code labels Dec 13, 2023
@hugtalbot
Copy link
Contributor

+200k lines removed = 💟

@fredroy
Copy link
Contributor Author

fredroy commented Dec 14, 2023

[ci-build][with-all-tests][force-full-build]

@hugtalbot hugtalbot added pr: status ready Approved a pull-request, ready to be squashed and removed pr: status to review To notify reviewers to review this pull-request labels Dec 20, 2023
@epernod epernod merged commit 7140f1d into sofa-framework:master Dec 21, 2023
3 checks passed
@fredroy fredroy deleted the find_cimg branch January 7, 2024 23:40
@hugtalbot hugtalbot added pr: backport todo This PR will be backported into the release preceeding its milestone. and removed pr: backport todo This PR will be backported into the release preceeding its milestone. labels Jan 10, 2024
@hugtalbot hugtalbot added this to the v24.06 milestone Jan 10, 2024
hugtalbot pushed a commit to hugtalbot/sofa that referenced this pull request Jan 16, 2024
…ork#4357)

* support interface-type for auto_target_properties install macro

* try updating install macro

* try updating install macro again

* use (only) find_package for CImg

* fix image compilation for newer version of cimg

* remove cimg src

* export mutex symbol with a .def file for windows

* add comment

* add fetchable cimg

* fix packaging

* fix image_gui

* fix image_type comparison

---------

Co-authored-by: erik pernod <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pr: clean Cleaning the code pr: status ready Approved a pull-request, ready to be squashed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants