Bug 83562 – [CMake] CMake SVG Code Generation fails to generate code for extra defines

• Status: RESOLVED
• Resolution: FIXED
• Component: WebCore Misc.

[Dominik Röttsches (drott)]

Mapping e.g. from CMAKE ON/OFF to ENABLE_FILTERS=ON is incorrect since the string value ON is not mapped to enabling code inside
#if ENABLE_FILTERS
for example.
See svgtags.in.

We need to generate ENABLE_FILTERS=1 for this to work, compare:
http://trac.webkit.org/browser/trunk/Source/WebCore/DerivedSources.make#L858

This should unskip a couple of SVG related tests on EFL.

[Dominik Röttsches (drott)]

Also, meant to say that this should fix a couple of currently failing SVG tests that rely on SVG filters.

[Dominik Röttsches (drott)]

Created attachment 136431 [details]
Fixing CMake build wrt SVG code generation

This should bring EFL test failures down by at least 17 cases.

[Rob Buis]

Comment on attachment 136431 [details]
Fixing CMake build wrt SVG code generation

View in context: https://bugs.webkit.org/attachment.cgi?id=136431&action=review

I agree with this patch. If you can reupload the patch with typo fix I can r+.

> Source/WebCore/CMakeLists.txt:2584
> +# SVG extra defines need to map to a numerical value for correct preprocessing of svtags.in.

svgtags.in

> Source/WebCore/CMakeLists.txt:2590
> +    LIST(APPEND SVG_EXTRA_DEFINES "ENABLE_SVG_FONTS=1")

Does this add a space separator between both defines?

[Gyuyoung Kim]

CC'ing patrick.

[Patrick R. Gansterer]

LGTM, since I have no better idea ATM

[Dominik Röttsches (drott)]

Created attachment 136434 [details]
Fixing CMake build wrt SVG code generation

Thanks for the quick review, typo fixed.

[Dominik Röttsches (drott)]

(In reply to comment #3)
> (From update of attachment 136431 [details])
> 
> > Source/WebCore/CMakeLists.txt:2590
> > +    LIST(APPEND SVG_EXTRA_DEFINES "ENABLE_SVG_FONTS=1")
> 
> Does this add a space separator between both defines?

Yes it does.

[Patrick R. Gansterer]

Comment on attachment 136434 [details]
Fixing CMake build wrt SVG code generation

View in context: https://bugs.webkit.org/attachment.cgi?id=136434&action=review

> Source/WebCore/CMakeLists.txt:2585
> +SET(SVG_EXTRA_DEFINES, "")

missed a point: comma after SVG_EXTRA_DEFINES

[Dominik Röttsches (drott)]

Created attachment 136436 [details]
Fixing CMake build wrt SVG code generation

(In reply to comment #8)
> (From update of attachment 136434 [details])
> View in context: https://bugs.webkit.org/attachment.cgi?id=136434&action=review
> 
> > Source/WebCore/CMakeLists.txt:2585
> > +SET(SVG_EXTRA_DEFINES, "")
> 
> missed a point: comma after SVG_EXTRA_DEFINES

Thanks. Fixed.

[Rob Buis]

Comment on attachment 136436 [details]
Fixing CMake build wrt SVG code generation

Looks fine. Should I cq+ too?

[Dominik Röttsches (drott)]

(In reply to comment #10)
> (From update of attachment 136436 [details])
> Looks fine. Should I cq+ too?

Yes please.

[Rob Buis]

Comment on attachment 136436 [details]
Fixing CMake build wrt SVG code generation

Looks fine. Should I cq+ too?

[Dominik Röttsches (drott)]

Thanks, Rob & Paroga!

[WebKit Review Bot]

Comment on attachment 136436 [details]
Fixing CMake build wrt SVG code generation

Clearing flags on attachment: 136436

Committed r113763: <http://trac.webkit.org/changeset/113763>

[WebKit Review Bot]

All reviewed patches have been landed.  Closing bug.