-
-
Notifications
You must be signed in to change notification settings - Fork 344
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
cmake: use of imported Cairo target #5352
base: main
Are you sure you want to change the base?
Conversation
Looks fine in general, I might just want to understand and compare what's different with respect to the new upstream file. https://github.com/WebKit/WebKit/blob/bc82205e7ef89756a44ccf963003c2cb439efe06/Source/cmake/FindCairo.cmake I can't do it right now on a mobile, but I'll try to get to it. Unless someone is faster than me ;) Great work otherwise! |
This FindCAIRO is really custom made for GRASS, (besides variable name case changing) reflecting behaviour of autotools build: Lines 1765 to 1816 in 5d794e9
Adding cairo-ft, cairo-fc, cairo-pdf, cairo-ps, cairo-svg, cairo-xlib and cairo-xlib-xrender libraries when available. |
Right, in that case, I don't see why I would delay this more than that. |
@@ -94,7 +94,7 @@ endif() | |||
# Graphics options | |||
option(WITH_X11 "Build with X11 support ." ${x11_default_option_enabled}) | |||
option(WITH_OPENGL "Build with opengl support ." ON) | |||
option(WITH_CAIRO "Build with cairo support ." ON) | |||
option(WITH_CAIRO "Build with Cairo support" ON) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We might want to change the lines around to match this format in a later PR, for example the two lines above had the same formatting.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Indeed.
Now, I actually checked out that link you provided. I haven't seen that version before, but a lot of the changes there are in fact very similar to mine. |
- Major update of FindCairo, to include all available Cairo sub-libraries - Use CMake's FindFontconfig, drop local find module
345be5a
to
f6f04fc
Compare
Use imported Cairo target, including: