Title: [113763] trunk/Source/WebCore
Revision
113763
Author
[email protected]
Date
2012-04-10 14:05:26 -0700 (Tue, 10 Apr 2012)

Log Message

[CMake] CMake SVG Code Generation fails to generate code for extra defines
https://bugs.webkit.org/show_bug.cgi?id=83562

Patch by Dominik Röttsches <[email protected]> on 2012-04-10
Reviewed by Rob Buis.

Fixing CMakeLists.txt to generate correct extra defines for SVG code generator.

* CMakeLists.txt:

Modified Paths

Diff

Modified: trunk/Source/WebCore/CMakeLists.txt (113762 => 113763)


--- trunk/Source/WebCore/CMakeLists.txt	2012-04-10 20:52:12 UTC (rev 113762)
+++ trunk/Source/WebCore/CMakeLists.txt	2012-04-10 21:05:26 UTC (rev 113763)
@@ -2582,8 +2582,16 @@
     LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/MathMLElementFactory.cpp)
 ENDIF ()
 
+# SVG extra defines need to map to a numerical value for correct preprocessing of svgtags.in.
+SET(SVG_EXTRA_DEFINES "")
+IF (ENABLE_FILTERS)
+    LIST(APPEND SVG_EXTRA_DEFINES "ENABLE_FILTERS=1")
+ENDIF ()
+IF (ENABLE_SVG_FONTS)
+    LIST(APPEND SVG_EXTRA_DEFINES "ENABLE_SVG_FONTS=1")
+ENDIF ()
 
-GENERATE_DOM_NAMES(SVG ${WEBCORE_DIR}/svg/svgattrs.in ${WEBCORE_DIR}/svg/svgtags.in "ENABLE_FILTERS=${ENABLE_FILTERS} ENABLE_SVG_FONTS=${ENABLE_SVG_FONTS}")
+GENERATE_DOM_NAMES(SVG ${WEBCORE_DIR}/svg/svgattrs.in ${WEBCORE_DIR}/svg/svgtags.in "${SVG_EXTRA_DEFINES}")
 LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/SVGNames.cpp)
 IF (ENABLE_SVG)
     LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/SVGElementFactory.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/JSSVGElementWrapperFactory.cpp)

Modified: trunk/Source/WebCore/ChangeLog (113762 => 113763)


--- trunk/Source/WebCore/ChangeLog	2012-04-10 20:52:12 UTC (rev 113762)
+++ trunk/Source/WebCore/ChangeLog	2012-04-10 21:05:26 UTC (rev 113763)
@@ -1,3 +1,14 @@
+2012-04-10  Dominik Röttsches  <[email protected]>
+
+        [CMake] CMake SVG Code Generation fails to generate code for extra defines
+        https://bugs.webkit.org/show_bug.cgi?id=83562
+
+        Reviewed by Rob Buis.
+
+        Fixing CMakeLists.txt to generate correct extra defines for SVG code generator.
+
+        * CMakeLists.txt:
+
 2012-04-10  Abhishek Arya  <[email protected]>
 
         Crash due to captions list not updated after section recalc.
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to