Title: [135621] trunk
Revision
135621
Author
[email protected]
Date
2012-11-23 08:54:35 -0800 (Fri, 23 Nov 2012)

Log Message

[CMake] Add support for winflexbison distribution
https://bugs.webkit.org/show_bug.cgi?id=102551

Reviewed by Laszlo Gombos.

Since GnuWin32 does not provide recent versions of bision and flex supporting
the alternative winflexbison distribution is the prefered option.

* Source/cmake/WebKitMacros.cmake:

Modified Paths

Diff

Modified: trunk/ChangeLog (135620 => 135621)


--- trunk/ChangeLog	2012-11-23 16:51:15 UTC (rev 135620)
+++ trunk/ChangeLog	2012-11-23 16:54:35 UTC (rev 135621)
@@ -1,3 +1,15 @@
+2012-11-23  Patrick Gansterer  <[email protected]>
+
+        [CMake] Add support for winflexbison distribution
+        https://bugs.webkit.org/show_bug.cgi?id=102551
+
+        Reviewed by Laszlo Gombos.
+
+        Since GnuWin32 does not provide recent versions of bision and flex supporting
+        the alternative winflexbison distribution is the prefered option.
+
+        * Source/cmake/WebKitMacros.cmake:
+
 2012-11-23  Laszlo Gombos  <[email protected]>
 
         [EFL] Define WTF_PLATFORM_EFL in Platform.h

Modified: trunk/Source/cmake/WebKitMacros.cmake (135620 => 135621)


--- trunk/Source/cmake/WebKitMacros.cmake	2012-11-23 16:51:15 UTC (rev 135620)
+++ trunk/Source/cmake/WebKitMacros.cmake	2012-11-23 16:54:35 UTC (rev 135621)
@@ -161,11 +161,16 @@
 
 
 MACRO (GENERATE_GRAMMAR _prefix _input _output_header _output_source _features)
+    # This is a workaround for winflexbison, which does not work corretly when
+    # run in a different working directory than the installation directory.
+    GET_FILENAME_COMPONENT(_working_directory ${BISON_EXECUTABLE} PATH)
+
     ADD_CUSTOM_COMMAND(
         OUTPUT ${_output_header} ${_output_source}
         MAIN_DEPENDENCY ${_input}
         DEPENDS ${_input}
         COMMAND ${PERL_EXECUTABLE} -I ${WEBCORE_DIR}/bindings/scripts ${WEBCORE_DIR}/css/makegrammar.pl --outputDir ${DERIVED_SOURCES_WEBCORE_DIR} --extraDefines "${_features}" --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" --bison "${BISON_EXECUTABLE}" --symbolsPrefix ${_prefix} ${_input}
+        WORKING_DIRECTORY ${_working_directory}
         VERBATIM)
 ENDMACRO ()
 
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to