Title: [154172] trunk/Source/WebCore
- Revision
- 154172
- Author
- [email protected]
- Date
- 2013-08-16 03:08:26 -0700 (Fri, 16 Aug 2013)
Log Message
<https://webkit.org/b/119885> [CMake] Always build our generated versions of ANGLE's glslang.cpp and glslang_tab.cpp
Reviewed by Gyuyoung Kim.
Now that r154109 has landed, all Bison versions (at least from 2.3 up
to the latest 3.0) should be able to generate versions of glslang* that
build correctly.
Since the idea is to remove the prebuilt files from future imports of
ANGLE, always building our own versions is a good idea, and allows us
to get rid of some very ugly CMake checks.
* CMakeLists.txt: Always build glslang.cpp and glslang_tab.cpp from
DERIVED_SOURCES_WEBCORE_DIR.
Modified Paths
Diff
Modified: trunk/Source/WebCore/CMakeLists.txt (154171 => 154172)
--- trunk/Source/WebCore/CMakeLists.txt 2013-08-16 09:58:42 UTC (rev 154171)
+++ trunk/Source/WebCore/CMakeLists.txt 2013-08-16 10:08:26 UTC (rev 154172)
@@ -2841,25 +2841,9 @@
${OPENGL_gl_LIBRARY}
)
- if (BISON_VERSION EQUAL "2.5" OR NOT (BISON_VERSION LESS "3.0"))
- # Bison 2.5 can not compile generated glslang.
- # See https://bugs.webkit.org/show_bug.cgi?id=93487
- #
- # With Bison 3.0 or greater the generated glslang will not compile.
- # See https://bugs.webkit.org/show_bug.cgi?id=119373
- # Use already generated glslang.
- list(APPEND ANGLESupport_SOURCES
- ${THIRDPARTY_DIR}/ANGLE/src/compiler/glslang_lex.cpp
- ${THIRDPARTY_DIR}/ANGLE/src/compiler/glslang_tab.cpp
- )
- else ()
- list(APPEND ANGLESupport_SOURCES
- ${DERIVED_SOURCES_WEBCORE_DIR}/glslang.cpp
- ${DERIVED_SOURCES_WEBCORE_DIR}/glslang_tab.cpp
- )
- endif ()
-
list(APPEND ANGLESupport_SOURCES
+ ${DERIVED_SOURCES_WEBCORE_DIR}/glslang.cpp
+ ${DERIVED_SOURCES_WEBCORE_DIR}/glslang_tab.cpp
${THIRDPARTY_DIR}/ANGLE/src/compiler/BuiltInFunctionEmulator.cpp
${THIRDPARTY_DIR}/ANGLE/src/compiler/CodeGenGLSL.cpp
${THIRDPARTY_DIR}/ANGLE/src/compiler/Compiler.cpp
Modified: trunk/Source/WebCore/ChangeLog (154171 => 154172)
--- trunk/Source/WebCore/ChangeLog 2013-08-16 09:58:42 UTC (rev 154171)
+++ trunk/Source/WebCore/ChangeLog 2013-08-16 10:08:26 UTC (rev 154172)
@@ -1,3 +1,20 @@
+2013-08-16 Raphael Kubo da Costa <[email protected]>
+
+ <https://webkit.org/b/119885> [CMake] Always build our generated versions of ANGLE's glslang.cpp and glslang_tab.cpp
+
+ Reviewed by Gyuyoung Kim.
+
+ Now that r154109 has landed, all Bison versions (at least from 2.3 up
+ to the latest 3.0) should be able to generate versions of glslang* that
+ build correctly.
+
+ Since the idea is to remove the prebuilt files from future imports of
+ ANGLE, always building our own versions is a good idea, and allows us
+ to get rid of some very ugly CMake checks.
+
+ * CMakeLists.txt: Always build glslang.cpp and glslang_tab.cpp from
+ DERIVED_SOURCES_WEBCORE_DIR.
+
2013-08-16 Julien Brianceau <[email protected]>
<https://webkit.org/b/119880> [Qt] Build fix (broken since r154142).
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
