Title: [127178] trunk
- Revision
- 127178
- Author
- [email protected]
- Date
- 2012-08-30 13:14:58 -0700 (Thu, 30 Aug 2012)
Log Message
[CMake] Suppress ANGLE compilation warnings
https://bugs.webkit.org/show_bug.cgi?id=95377
Reviewed by Antonio Gomes.
.:
Change WEBKIT_SET_EXTRA_COMPILER_FLAGS so it has an option to suppress C++ warnings.
* Source/cmake/WebKitHelpers.cmake:
Source/WebCore:
Compile ANGLE sources in a static library, and make sure the compile flags suppress warnings.
* CMakeLists.txt:
Modified Paths
Diff
Modified: trunk/ChangeLog (127177 => 127178)
--- trunk/ChangeLog 2012-08-30 20:10:51 UTC (rev 127177)
+++ trunk/ChangeLog 2012-08-30 20:14:58 UTC (rev 127178)
@@ -1,3 +1,14 @@
+2012-08-30 Rob Buis <[email protected]>
+
+ [CMake] Suppress ANGLE compilation warnings
+ https://bugs.webkit.org/show_bug.cgi?id=95377
+
+ Reviewed by Antonio Gomes.
+
+ Change WEBKIT_SET_EXTRA_COMPILER_FLAGS so it has an option to suppress C++ warnings.
+
+ * Source/cmake/WebKitHelpers.cmake:
+
2012-08-29 Thiago Macieira <[email protected]>
Tell git-archive to not export .gitattributes and .gitignore
Modified: trunk/Source/WebCore/CMakeLists.txt (127177 => 127178)
--- trunk/Source/WebCore/CMakeLists.txt 2012-08-30 20:10:51 UTC (rev 127177)
+++ trunk/Source/WebCore/CMakeLists.txt 2012-08-30 20:14:58 UTC (rev 127178)
@@ -2564,18 +2564,18 @@
IF (BISON_VERSION EQUAL "2.5")
# Bison 2.5 can not compile generated glslang.
# See https://bugs.webkit.org/show_bug.cgi?id=93487
- LIST(APPEND WebCore_SOURCES
+ LIST(APPEND ANGLESupport_SOURCES
${THIRDPARTY_DIR}/ANGLE/src/compiler/glslang_lex.cpp
${THIRDPARTY_DIR}/ANGLE/src/compiler/glslang_tab.cpp
)
ELSE ()
- LIST(APPEND WebCore_SOURCES
+ LIST(APPEND ANGLESupport_SOURCES
${DERIVED_SOURCES_WEBCORE_DIR}/glslang.cpp
${DERIVED_SOURCES_WEBCORE_DIR}/glslang_tab.cpp
)
ENDIF ()
- LIST(APPEND WebCore_SOURCES
+ LIST(APPEND ANGLESupport_SOURCES
${THIRDPARTY_DIR}/ANGLE/src/compiler/BuiltInFunctionEmulator.cpp
${THIRDPARTY_DIR}/ANGLE/src/compiler/CodeGenGLSL.cpp
${THIRDPARTY_DIR}/ANGLE/src/compiler/Compiler.cpp
@@ -2964,6 +2964,14 @@
ADD_DEPENDENCIES(${WebCore_LIBRARY_NAME} ${_javascript_Core_LIBRARY_NAME})
ADD_DEPENDENCIES(${WebCoreTestSupport_LIBRARY_NAME} ${WebCore_LIBRARY_NAME})
+IF (WTF_USE_3D_GRAPHICS)
+ SET(ANGLESupport_LIBRARY_NAME ANGLESupport)
+ ADD_LIBRARY(${ANGLESupport_LIBRARY_NAME} STATIC ${ANGLESupport_SOURCES})
+ SET_TARGET_PROPERTIES(${ANGLESupport_LIBRARY_NAME} PROPERTIES FOLDER "WebCore")
+ LIST(APPEND WebCore_LIBRARIES ${ANGLESupport_LIBRARY_NAME})
+ WEBKIT_SET_EXTRA_COMPILER_FLAGS(${ANGLESupport_LIBRARY_NAME} IGNORECXX_WARNINGS)
+ENDIF ()
+
TARGET_LINK_LIBRARIES(${WebCore_LIBRARY_NAME} ${WebCore_LIBRARIES})
IF (WebCore_LINK_FLAGS)
Modified: trunk/Source/WebCore/ChangeLog (127177 => 127178)
--- trunk/Source/WebCore/ChangeLog 2012-08-30 20:10:51 UTC (rev 127177)
+++ trunk/Source/WebCore/ChangeLog 2012-08-30 20:14:58 UTC (rev 127178)
@@ -1,3 +1,14 @@
+2012-08-30 Rob Buis <[email protected]>
+
+ [CMake] Suppress ANGLE compilation warnings
+ https://bugs.webkit.org/show_bug.cgi?id=95377
+
+ Reviewed by Antonio Gomes.
+
+ Compile ANGLE sources in a static library, and make sure the compile flags suppress warnings.
+
+ * CMakeLists.txt:
+
2012-08-30 Victor Carbune <[email protected]>
[Chromium] Layout Test media/track/track-cue-rendering-snap-to-lines-not-set.html is flaky
Modified: trunk/Source/cmake/WebKitHelpers.cmake (127177 => 127178)
--- trunk/Source/cmake/WebKitHelpers.cmake 2012-08-30 20:10:51 UTC (rev 127177)
+++ trunk/Source/cmake/WebKitHelpers.cmake 2012-08-30 20:14:58 UTC (rev 127178)
@@ -1,6 +1,9 @@
+INCLUDE(CMakeParseArguments)
# Sets extra compile flags for a target, depending on the compiler being used.
# Currently, only GCC is supported.
MACRO(WEBKIT_SET_EXTRA_COMPILER_FLAGS _target)
+ SET(options IGNORECXX_WARNINGS)
+ CMAKE_PARSE_ARGUMENTS("OPTION" "IGNORECXX_WARNINGS" "" "" ${ARGN})
IF (CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
GET_TARGET_PROPERTY(OLD_COMPILE_FLAGS ${_target} COMPILE_FLAGS)
IF (${OLD_COMPILE_FLAGS} STREQUAL "OLD_COMPILE_FLAGS-NOTFOUND")
@@ -33,11 +36,13 @@
SET(OLD_COMPILE_FLAGS "-fno-exceptions -fno-strict-aliasing ${OLD_COMPILE_FLAGS}")
# Enable warnings by default
- SET(OLD_COMPILE_FLAGS "-W -DANOTHER_BRICK_IN_THE -Wall -Wextra -Wcast-align -Wchar-subscripts -Wformat -Wformat-security -Wmissing-format-attribute -Wno-format-y2k -Wno-parentheses -Wno-unused-parameter -Wpointer-arith -Wreturn-type -Wundef -Wwrite-strings ${OLD_COMPILE_FLAGS}")
+ IF (NOT ${OPTION_IGNORECXX_WARNINGS})
+ SET(OLD_COMPILE_FLAGS "-W -DANOTHER_BRICK_IN_THE -Wall -Wextra -Wcast-align -Wchar-subscripts -Wformat -Wformat-security -Wmissing-format-attribute -Wno-format-y2k -Wno-parentheses -Wno-unused-parameter -Wpointer-arith -Wreturn-type -Wundef -Wwrite-strings ${OLD_COMPILE_FLAGS}")
+ ENDIF ()
# Disable C++0x compat warnings for GCC >= 4.6.0 until we build
# cleanly with that.
- IF (NOT ${COMPILER_VERSION} VERSION_LESS "4.6.0")
+ IF (NOT ${OPTION_IGNORECXX_WARNINGS} AND NOT ${COMPILER_VERSION} VERSION_LESS "4.6.0")
SET(OLD_COMPILE_FLAGS "${OLD_COMPILE_FLAGS} -Wno-c++0x-compat")
ENDIF ()
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
