Title: [185056] trunk
Revision
185056
Author
[email protected]
Date
2015-06-01 03:57:28 -0700 (Mon, 01 Jun 2015)

Log Message

[cmake] Suppress unused parameter warnings in WebKit2 and TestNetscapePlugIn
https://bugs.webkit.org/show_bug.cgi?id=145264

Reviewed by Carlos Garcia Campos.

Source/WebKit2:

* CMakeLists.txt: Use COMPILE_FLAGS instead of CMAKE_<C|CXX>_FLAGS to put -Wno-unused-parameter after -Wextra.

Tools:

* DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt: Set extra compiler flags and suppress only unused parameter warnings.

Modified Paths

Diff

Modified: trunk/Source/WebKit2/CMakeLists.txt (185055 => 185056)


--- trunk/Source/WebKit2/CMakeLists.txt	2015-06-01 09:11:05 UTC (rev 185055)
+++ trunk/Source/WebKit2/CMakeLists.txt	2015-06-01 10:57:28 UTC (rev 185056)
@@ -770,10 +770,6 @@
     endif ()
 endmacro()
 
-# Suppress unused parameter warnings for sources in WebKit2.
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-parameter")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-parameter")
-
 WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
 
 GENERATE_WEBKIT2_MESSAGE_SOURCES(WebKit2_DERIVED_SOURCES "${WebKit2_MESSAGES_IN_FILES}")
@@ -787,6 +783,9 @@
 target_link_libraries(WebKit2 ${WebKit2_LIBRARIES})
 set_target_properties(WebKit2 PROPERTIES FOLDER "WebKit")
 
+# Suppress unused parameter warnings for sources in WebKit2.
+ADD_TARGET_PROPERTIES(WebKit2 COMPILE_FLAGS "-Wno-unused-parameter")
+
 if (WebKit2_VERSION_SCRIPT)
     ADD_TARGET_PROPERTIES(WebKit2 LINK_FLAGS "${WebKit2_VERSION_SCRIPT}")
 endif ()

Modified: trunk/Source/WebKit2/ChangeLog (185055 => 185056)


--- trunk/Source/WebKit2/ChangeLog	2015-06-01 09:11:05 UTC (rev 185055)
+++ trunk/Source/WebKit2/ChangeLog	2015-06-01 10:57:28 UTC (rev 185056)
@@ -1,3 +1,12 @@
+2015-06-01  Csaba Osztrogonác  <[email protected]>
+
+        [cmake] Suppress unused parameter warnings in WebKit2 and TestNetscapePlugIn
+        https://bugs.webkit.org/show_bug.cgi?id=145264
+
+        Reviewed by Carlos Garcia Campos.
+
+        * CMakeLists.txt: Use COMPILE_FLAGS instead of CMAKE_<C|CXX>_FLAGS to put -Wno-unused-parameter after -Wextra.
+
 2015-05-31  Gavin Barraclough  <[email protected]>
 
         PDFs always think they're visible on iOS.

Modified: trunk/Tools/ChangeLog (185055 => 185056)


--- trunk/Tools/ChangeLog	2015-06-01 09:11:05 UTC (rev 185055)
+++ trunk/Tools/ChangeLog	2015-06-01 10:57:28 UTC (rev 185056)
@@ -1,3 +1,12 @@
+2015-06-01  Csaba Osztrogonác  <[email protected]>
+
+        [cmake] Suppress unused parameter warnings in WebKit2 and TestNetscapePlugIn
+        https://bugs.webkit.org/show_bug.cgi?id=145264
+
+        Reviewed by Carlos Garcia Campos.
+
+        * DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt: Set extra compiler flags and suppress only unused parameter warnings.
+
 2015-05-30  Ryosuke Niwa  <[email protected]>
 
         Unreviewed build fix after r185014. Some tests only have subtests and not metrics.

Modified: trunk/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt (185055 => 185056)


--- trunk/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt	2015-06-01 09:11:05 UTC (rev 185055)
+++ trunk/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt	2015-06-01 10:57:28 UTC (rev 185056)
@@ -49,3 +49,7 @@
 add_library(TestNetscapePlugin SHARED ${WebKitTestNetscapePlugin_SOURCES})
 target_link_libraries(TestNetscapePlugin ${WebKitTestNetscapePlugin_LIBRARIES})
 set_target_properties(TestNetscapePlugin PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/plugins)
+WEBKIT_SET_EXTRA_COMPILER_FLAGS(TestNetscapePlugin)
+
+# Suppress unused parameter warnings for sources in WebKit2.
+ADD_TARGET_PROPERTIES(TestNetscapePlugin COMPILE_FLAGS "-Wno-unused-parameter")
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to