Attachment 255299 Details for Bug 146185 – Patch

[patch] Patch

bug-146185-20150620165917.patch (text/plain), 10.81 KB, created by Michael Catanzaro on 2015-06-20 14:59:57 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Catanzaro

Created: 2015-06-20 14:59:57 PDT

Size: 10.81 KB

patch

obsolete

>Subversion Revision: 185794
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 7bf658e8c5028e8042c19dd6c3f230092cb08749..39725e9765ab0d6076050805fcb5e8b17eeae31a 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,26 @@
>+2015-06-20  Michael Catanzaro  <mcatanzaro@igalia.com>
>+
>+        [CMake] Ignore warnings from system headers when compiling Tools
>+        https://bugs.webkit.org/show_bug.cgi?id=146185
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Use the SYSTEM argument to the include_directories() command to silence compiler warnings
>+        from system headers that we don't control.
>+
>+        * DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt:
>+        * ImageDiff/CMakeLists.txt: Also, remove an EFL include directory from here...
>+        * ImageDiff/PlatformEfl.cmake: ...and put it here where it belongs.
>+        * ImageDiff/PlatformGTK.cmake:
>+        * MiniBrowser/efl/CMakeLists.txt:
>+        * MiniBrowser/gtk/CMakeLists.txt:
>+        * TestWebKitAPI/PlatformEfl.cmake:
>+        * TestWebKitAPI/PlatformGTK.cmake:
>+        * TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt:
>+        * WebKitTestRunner/CMakeLists.txt:
>+        * WebKitTestRunner/PlatformEfl.cmake:
>+        * WebKitTestRunner/PlatformGTK.cmake:
>+
> 2015-06-19  Ryosuke Niwa  <rniwa@webkit.org>
> 
>         Build fix after r146125.
>diff --git a/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt b/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt
>index b4b8c22010a71c0f56ba452d84c713495f624658..dfd308f8b5a6c8ebb84c882b096d92fd16d1fc7e 100644
>--- a/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt
>+++ b/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt
>@@ -33,10 +33,14 @@ set(WebKitTestNetscapePlugin_INCLUDE_DIRECTORIES
>     ${WEBKIT_TESTNETSCAPEPLUGIN_DIR}
>     ${WEBKIT_TESTNETSCAPEPLUGIN_DIR}/unix/ForwardingHeaders
>     ${WEBCORE_DIR}
>+)
>+
>+set(WebKitTestNetscapePlugin_SYSTEM_INCLUDE_DIRECTORIES
>     ${X11_INCLUDE_DIR}
> )
> 
> include_directories(${WebKitTestNetscapePlugin_INCLUDE_DIRECTORIES})
>+include_directories(SYSTEM ${WebKitTestNetscapePlugin_SYSTEM_INCLUDE_DIRECTORIES})
> 
> set(WebKitTestNetscapePlugin_LIBRARIES
>     ${X11_LIBRARIES}
>diff --git a/Tools/ImageDiff/CMakeLists.txt b/Tools/ImageDiff/CMakeLists.txt
>index 9b4c33e802825b71e0bea9148bc272bac4d11f00..6ce4ed522035c2639882d51212042ab1d6a77352 100644
>--- a/Tools/ImageDiff/CMakeLists.txt
>+++ b/Tools/ImageDiff/CMakeLists.txt
>@@ -2,10 +2,11 @@ set(IMAGE_DIFF_DIR "${TOOLS_DIR}/ImageDiff")
> 
> set(IMAGE_DIFF_INCLUDE_DIRECTORIES
>     ${CMAKE_BINARY_DIR}
>-    ${ECORE_IMF_INCLUDE_DIRS}
>     ${WTF_DIR}
> )
> 
>+set(IMAGE_DIFF_SYSTEM_INCLUDE_DIRECTORIES "")
>+
> set(IMAGE_DIFF_LIBRARIES
>     WTF
> )
>@@ -13,6 +14,7 @@ set(IMAGE_DIFF_LIBRARIES
> WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
> 
> include_directories(${IMAGE_DIFF_INCLUDE_DIRECTORIES})
>+include_directories(SYSTEM ${IMAGE_DIFF_SYSTEM_INCLUDE_DIRECTORIES})
> add_executable(ImageDiff ${IMAGE_DIFF_SOURCES})
> target_link_libraries(ImageDiff ${IMAGE_DIFF_LIBRARIES})
> set_target_properties(ImageDiff PROPERTIES FOLDER "Tools")
>diff --git a/Tools/ImageDiff/PlatformEfl.cmake b/Tools/ImageDiff/PlatformEfl.cmake
>index ff79e951e6de8e590a3a47b072edcc29a9bf887d..19e6aeebe7dde5aa083b762cc252c4a1521f86dd 100644
>--- a/Tools/ImageDiff/PlatformEfl.cmake
>+++ b/Tools/ImageDiff/PlatformEfl.cmake
>@@ -2,8 +2,9 @@ set(IMAGE_DIFF_SOURCES
>     ${IMAGE_DIFF_DIR}/efl/ImageDiff.cpp
> )
> 
>-list(APPEND IMAGE_DIFF_INCLUDE_DIRECTORIES
>+list(APPEND IMAGE_DIFF_SYSTEM_INCLUDE_DIRECTORIES
>     ${ECORE_EVAS_INCLUDE_DIRS}
>+    ${ECORE_IMF_INCLUDE_DIRS}
> )
> 
> list(APPEND IMAGE_DIFF_LIBRARIES
>diff --git a/Tools/ImageDiff/PlatformGTK.cmake b/Tools/ImageDiff/PlatformGTK.cmake
>index d45b81962c8ffd3754997e81ffeae0a4714d77bf..8b37ca08b9b2c4fc10055433394458b6e49435c6 100644
>--- a/Tools/ImageDiff/PlatformGTK.cmake
>+++ b/Tools/ImageDiff/PlatformGTK.cmake
>@@ -2,7 +2,7 @@ set(IMAGE_DIFF_SOURCES
>     ${IMAGE_DIFF_DIR}/gtk/ImageDiff.cpp
> )
> 
>-list(APPEND IMAGE_DIFF_INCLUDE_DIRECTORIES
>+list(APPEND IMAGE_DIFF_SYSTEM_INCLUDE_DIRECTORIES
>     ${GTK_INCLUDE_DIRS}
> )
> 
>diff --git a/Tools/MiniBrowser/efl/CMakeLists.txt b/Tools/MiniBrowser/efl/CMakeLists.txt
>index 87ede9d00c28b6692bb45760836f4550489fca02..b7d6e37c2b446c4b149ca33df6171155daf25977 100644
>--- a/Tools/MiniBrowser/efl/CMakeLists.txt
>+++ b/Tools/MiniBrowser/efl/CMakeLists.txt
>@@ -11,8 +11,14 @@ set(MiniBrowser_SOURCES
> )
> 
> set(MiniBrowser_INCLUDE_DIRECTORIES
>-    ${CAIRO_INCLUDE_DIRS}
>     ${DERIVED_SOURCES_WEBKIT2_DIR}/include
>+    ${WEBKIT2_DIR}/UIProcess/API/efl
>+    ${WEBKIT2_DIR}
>+    ${CMAKE_SOURCE_DIR}/Source
>+)
>+
>+set(MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES
>+    ${CAIRO_INCLUDE_DIRS}
>     ${ECORE_INCLUDE_DIRS}
>     ${ECORE_EVAS_INCLUDE_DIRS}
>     ${ECORE_CON_INCLUDE_DIRS}
>@@ -30,9 +36,6 @@ set(MiniBrowser_INCLUDE_DIRECTORIES
>     ${ETHUMB_INCLUDE_DIRS}
>     ${ETHUMB_CLIENT_INCLUDE_DIRS}
>     ${EVAS_INCLUDE_DIRS}
>-    ${WEBKIT2_DIR}/UIProcess/API/efl
>-    ${WEBKIT2_DIR}
>-    ${CMAKE_SOURCE_DIR}/Source
> )
> 
> set(MiniBrowser_LIBRARIES
>@@ -61,6 +64,7 @@ set(MiniBrowser_LIBRARIES
> 
> if (ELEMENTARY_FOUND)
>     include_directories(${MiniBrowser_INCLUDE_DIRECTORIES})
>+    include_directories(SYSTEM ${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES})
>     add_executable(MiniBrowser ${MiniBrowser_SOURCES})
>     target_link_libraries(MiniBrowser ${MiniBrowser_LIBRARIES})
>     set_target_properties(MiniBrowser PROPERTIES FOLDER "Tools")
>diff --git a/Tools/MiniBrowser/gtk/CMakeLists.txt b/Tools/MiniBrowser/gtk/CMakeLists.txt
>index 2cf93e89ea913bfe21f838b6239eb5a0a1364304..b11769a1811a57e19356f46ab4f50e9e2144550a 100644
>--- a/Tools/MiniBrowser/gtk/CMakeLists.txt
>+++ b/Tools/MiniBrowser/gtk/CMakeLists.txt
>@@ -25,6 +25,9 @@ set(MiniBrowser_INCLUDE_DIRECTORIES
>     ${FORWARDING_HEADERS_WEBKIT2GTK_DIR}
>     ${FORWARDING_HEADERS_DIR}
>     ${CMAKE_SOURCE_DIR}/Source
>+)
>+
>+set(MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES
>     ${GTK3_INCLUDE_DIRS}
>     ${GLIB_INCLUDE_DIRS}
>     ${LIBSOUP_INCLUDE_DIRS}
>@@ -50,8 +53,9 @@ if (DEVELOPER_MODE)
> endif ()
> 
> include_directories(${MiniBrowser_INCLUDE_DIRECTORIES})
>+include_directories(SYSTEM ${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES})
> add_executable(MiniBrowser ${MiniBrowser_SOURCES})
> target_link_libraries(MiniBrowser ${MiniBrowser_LIBRARIES})
> set_target_properties(MiniBrowser PROPERTIES FOLDER "Tools")
> 
>-install(TARGETS MiniBrowser DESTINATION "${EXEC_INSTALL_DIR}")
>\ No newline at end of file
>+install(TARGETS MiniBrowser DESTINATION "${EXEC_INSTALL_DIR}")
>diff --git a/Tools/TestWebKitAPI/PlatformEfl.cmake b/Tools/TestWebKitAPI/PlatformEfl.cmake
>index cbfb7ebe0dbb73956cbf73ec4631bca7ff0b2cbb..dabdbce5c68a830b94f2708a455d77bdb3e1753d 100644
>--- a/Tools/TestWebKitAPI/PlatformEfl.cmake
>+++ b/Tools/TestWebKitAPI/PlatformEfl.cmake
>@@ -11,6 +11,9 @@ include_directories(
>     ${WEBKIT2_DIR}/UIProcess/API/C/soup
>     ${WEBKIT2_DIR}/UIProcess/API/C/efl
>     ${WEBKIT2_DIR}/UIProcess/API/efl
>+)
>+
>+include_directories(SYSTEM
>     ${ECORE_EVAS_INCLUDE_DIRS}
>     ${GLIB_INCLUDE_DIRS}
>     ${LIBSOUP_INCLUDE_DIRS}
>diff --git a/Tools/TestWebKitAPI/PlatformGTK.cmake b/Tools/TestWebKitAPI/PlatformGTK.cmake
>index 62bfeb34be4d159c109eab5a588049ecd8a2fed0..d641b8965632a40ad868a9cbdd618e8764c3b66e 100644
>--- a/Tools/TestWebKitAPI/PlatformGTK.cmake
>+++ b/Tools/TestWebKitAPI/PlatformGTK.cmake
>@@ -15,11 +15,15 @@ include_directories(
>     ${WEBKIT2_DIR}/UIProcess/API/C/soup
>     ${WEBKIT2_DIR}/UIProcess/API/C/gtk
>     ${WEBKIT2_DIR}/UIProcess/API/gtk
>+)
>+
>+include_directories(SYSTEM
>     ${GDK3_INCLUDE_DIRS}
>     ${GLIB_INCLUDE_DIRS}
>     ${GTK3_INCLUDE_DIRS}
>     ${LIBSOUP_INCLUDE_DIRS}
> )
>+
> set(test_main_SOURCES
>     ${TESTWEBKITAPI_DIR}/gtk/main.cpp
> )
>diff --git a/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt b/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt
>index 72ed45d1c6c50dedf58dc58b2034c87e0bdadf4f..5036d43aebf86c772df6dbefd582b4a68095ce86 100644
>--- a/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt
>+++ b/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt
>@@ -21,6 +21,9 @@ include_directories(
>     ${FORWARDING_HEADERS_WEBKIT2GTK_DIR}
>     ${FORWARDING_HEADERS_WEBKIT2GTK_EXTENSION_DIR}
>     ${TOOLS_DIR}/TestWebKitAPI/gtk/WebKit2Gtk
>+)
>+
>+include_directories(SYSTEM
>     ${ATSPI_INCLUDE_DIRS}
>     ${GLIB_INCLUDE_DIRS}
>     ${GTK3_INCLUDE_DIRS}
>diff --git a/Tools/WebKitTestRunner/CMakeLists.txt b/Tools/WebKitTestRunner/CMakeLists.txt
>index 89916b8dc923ad9368d772664315692b3f7fb613..0f537981dd260069514e4936ea04aefc2763144b 100644
>--- a/Tools/WebKitTestRunner/CMakeLists.txt
>+++ b/Tools/WebKitTestRunner/CMakeLists.txt
>@@ -49,6 +49,9 @@ set(WebKitTestRunner_INCLUDE_DIRECTORIES
>     ${DERIVED_SOURCES_DIR}/InjectedBundle
>     ${CMAKE_BINARY_DIR}
>     ${CMAKE_SOURCE_DIR}/Source
>+)
>+
>+set(WebKitTestRunner_SYSTEM_INCLUDE_DIRECTORIES
>     ${LIBSOUP_INCLUDE_DIRS}
> )
> 
>@@ -94,6 +97,7 @@ GENERATE_BINDINGS(WebKitTestRunnerInjectedBundle_SOURCES
> WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
> 
> include_directories(${WebKitTestRunner_INCLUDE_DIRECTORIES})
>+include_directories(SYSTEM ${WebKitTestRunner_SYSTEM_INCLUDE_DIRECTORIES})
> 
> add_library(TestRunnerInjectedBundle SHARED ${WebKitTestRunnerInjectedBundle_SOURCES})
> target_link_libraries(TestRunnerInjectedBundle ${WebKitTestRunnerInjectedBundle_LIBRARIES})
>diff --git a/Tools/WebKitTestRunner/PlatformEfl.cmake b/Tools/WebKitTestRunner/PlatformEfl.cmake
>index d3f9bc6ca46be669d6d0fde3994f8938e3cdedc3..e1f822363119a7fa0c6f26cc61ede2574ccd4c4f 100644
>--- a/Tools/WebKitTestRunner/PlatformEfl.cmake
>+++ b/Tools/WebKitTestRunner/PlatformEfl.cmake
>@@ -15,6 +15,9 @@ list(APPEND WebKitTestRunner_SOURCES
> list(APPEND WebKitTestRunner_INCLUDE_DIRECTORIES
>     ${DERIVED_SOURCES_WEBKIT2_DIR}/include
>     ${WEBKIT2_DIR}/UIProcess/API/efl
>+)
>+
>+list(APPEND WebKitTestRunner_SYSTEM_INCLUDE_DIRECTORIES
>     ${CAIRO_INCLUDE_DIRS}
>     ${ECORE_INCLUDE_DIRS}
>     ${ECORE_EVAS_INCLUDE_DIRS}
>@@ -63,4 +66,4 @@ list(APPEND WebKitTestRunnerInjectedBundle_SOURCES
> # FIXME: EFL port needs to have own test font and font configure instead of gtk test font in future
> # FIXME: DOWNLOADED_FONTS_DIR should not hardcode the directory structure.
> add_definitions(-DFONTS_CONF_DIR="${TOOLS_DIR}/WebKitTestRunner/gtk/fonts"
>-                -DDOWNLOADED_FONTS_DIR="${CMAKE_SOURCE_DIR}/WebKitBuild/DependenciesEFL/Source/webkitgtk-test-fonts")
>\ No newline at end of file
>+                -DDOWNLOADED_FONTS_DIR="${CMAKE_SOURCE_DIR}/WebKitBuild/DependenciesEFL/Source/webkitgtk-test-fonts")
>diff --git a/Tools/WebKitTestRunner/PlatformGTK.cmake b/Tools/WebKitTestRunner/PlatformGTK.cmake
>index f11754558a3069351e0f4fbade9d03c00ee20996..58e8ea8e0dfc01cbed048545d46dcbb67566b8e0 100644
>--- a/Tools/WebKitTestRunner/PlatformGTK.cmake
>+++ b/Tools/WebKitTestRunner/PlatformGTK.cmake
>@@ -20,6 +20,9 @@ list(APPEND WebKitTestRunner_SOURCES
> list(APPEND WebKitTestRunner_INCLUDE_DIRECTORIES
>     ${FORWARDING_HEADERS_DIR}
>     ${WTF_DIR}/wtf/glib
>+)
>+
>+list(APPEND WebKitTestRunner_SYSTEM_INCLUDE_DIRECTORIES
>     ${ATK_INCLUDE_DIRS}
>     ${CAIRO_INCLUDE_DIRS}
>     ${GTK3_INCLUDE_DIRS}

Actions: View | Formatted Diff | Diff

Attachments on bug 146185: 255299 | 255322