Diff
Modified: trunk/Tools/ChangeLog (185805 => 185806)
--- trunk/Tools/ChangeLog 2015-06-21 10:06:14 UTC (rev 185805)
+++ trunk/Tools/ChangeLog 2015-06-21 13:15:54 UTC (rev 185806)
@@ -1,3 +1,26 @@
+2015-06-21 Michael Catanzaro <mcatanz...@igalia.com>
+
+ [CMake] Ignore warnings from system headers when compiling Tools
+ https://bugs.webkit.org/show_bug.cgi?id=146185
+
+ Reviewed by Martin Robinson.
+
+ 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-20 Michael Catanzaro <mcatanz...@igalia.com>
[GTK] Define GDK_VERSION_MIN_REQUIRED when compiling MiniBrowser
Modified: trunk/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt (185805 => 185806)
--- trunk/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt 2015-06-21 10:06:14 UTC (rev 185805)
+++ trunk/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt 2015-06-21 13:15:54 UTC (rev 185806)
@@ -33,10 +33,14 @@
${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}
Modified: trunk/Tools/ImageDiff/CMakeLists.txt (185805 => 185806)
--- trunk/Tools/ImageDiff/CMakeLists.txt 2015-06-21 10:06:14 UTC (rev 185805)
+++ trunk/Tools/ImageDiff/CMakeLists.txt 2015-06-21 13:15:54 UTC (rev 185806)
@@ -2,10 +2,11 @@
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 @@
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")
Modified: trunk/Tools/ImageDiff/PlatformEfl.cmake (185805 => 185806)
--- trunk/Tools/ImageDiff/PlatformEfl.cmake 2015-06-21 10:06:14 UTC (rev 185805)
+++ trunk/Tools/ImageDiff/PlatformEfl.cmake 2015-06-21 13:15:54 UTC (rev 185806)
@@ -2,8 +2,9 @@
${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
Modified: trunk/Tools/ImageDiff/PlatformGTK.cmake (185805 => 185806)
--- trunk/Tools/ImageDiff/PlatformGTK.cmake 2015-06-21 10:06:14 UTC (rev 185805)
+++ trunk/Tools/ImageDiff/PlatformGTK.cmake 2015-06-21 13:15:54 UTC (rev 185806)
@@ -2,7 +2,7 @@
${IMAGE_DIFF_DIR}/gtk/ImageDiff.cpp
)
-list(APPEND IMAGE_DIFF_INCLUDE_DIRECTORIES
+list(APPEND IMAGE_DIFF_SYSTEM_INCLUDE_DIRECTORIES
${GTK_INCLUDE_DIRS}
)
Modified: trunk/Tools/MiniBrowser/efl/CMakeLists.txt (185805 => 185806)
--- trunk/Tools/MiniBrowser/efl/CMakeLists.txt 2015-06-21 10:06:14 UTC (rev 185805)
+++ trunk/Tools/MiniBrowser/efl/CMakeLists.txt 2015-06-21 13:15:54 UTC (rev 185806)
@@ -11,8 +11,14 @@
)
set(MiniBrowser_INCLUDE_DIRECTORIES
+ ${DERIVED_SOURCES_WEBKIT2_DIR}/include
+ ${WEBKIT2_DIR}/UIProcess/API/efl
+ ${WEBKIT2_DIR}
+ ${CMAKE_SOURCE_DIR}/Source
+)
+
+set(MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES
${CAIRO_INCLUDE_DIRS}
- ${DERIVED_SOURCES_WEBKIT2_DIR}/include
${ECORE_INCLUDE_DIRS}
${ECORE_EVAS_INCLUDE_DIRS}
${ECORE_CON_INCLUDE_DIRS}
@@ -30,9 +36,6 @@
${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 @@
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")
Modified: trunk/Tools/MiniBrowser/gtk/CMakeLists.txt (185805 => 185806)
--- trunk/Tools/MiniBrowser/gtk/CMakeLists.txt 2015-06-21 10:06:14 UTC (rev 185805)
+++ trunk/Tools/MiniBrowser/gtk/CMakeLists.txt 2015-06-21 13:15:54 UTC (rev 185806)
@@ -25,6 +25,9 @@
${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}
@@ -52,6 +55,7 @@
add_definitions(-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_6)
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")
Modified: trunk/Tools/TestWebKitAPI/PlatformEfl.cmake (185805 => 185806)
--- trunk/Tools/TestWebKitAPI/PlatformEfl.cmake 2015-06-21 10:06:14 UTC (rev 185805)
+++ trunk/Tools/TestWebKitAPI/PlatformEfl.cmake 2015-06-21 13:15:54 UTC (rev 185806)
@@ -11,6 +11,9 @@
${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}
Modified: trunk/Tools/TestWebKitAPI/PlatformGTK.cmake (185805 => 185806)
--- trunk/Tools/TestWebKitAPI/PlatformGTK.cmake 2015-06-21 10:06:14 UTC (rev 185805)
+++ trunk/Tools/TestWebKitAPI/PlatformGTK.cmake 2015-06-21 13:15:54 UTC (rev 185806)
@@ -15,11 +15,15 @@
${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
)
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt (185805 => 185806)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt 2015-06-21 10:06:14 UTC (rev 185805)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt 2015-06-21 13:15:54 UTC (rev 185806)
@@ -21,6 +21,9 @@
${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}
Modified: trunk/Tools/WebKitTestRunner/CMakeLists.txt (185805 => 185806)
--- trunk/Tools/WebKitTestRunner/CMakeLists.txt 2015-06-21 10:06:14 UTC (rev 185805)
+++ trunk/Tools/WebKitTestRunner/CMakeLists.txt 2015-06-21 13:15:54 UTC (rev 185806)
@@ -49,6 +49,9 @@
${DERIVED_SOURCES_DIR}/InjectedBundle
${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/Source
+)
+
+set(WebKitTestRunner_SYSTEM_INCLUDE_DIRECTORIES
${LIBSOUP_INCLUDE_DIRS}
)
@@ -94,6 +97,7 @@
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})
Modified: trunk/Tools/WebKitTestRunner/PlatformEfl.cmake (185805 => 185806)
--- trunk/Tools/WebKitTestRunner/PlatformEfl.cmake 2015-06-21 10:06:14 UTC (rev 185805)
+++ trunk/Tools/WebKitTestRunner/PlatformEfl.cmake 2015-06-21 13:15:54 UTC (rev 185806)
@@ -15,6 +15,9 @@
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 @@
# 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")
Modified: trunk/Tools/WebKitTestRunner/PlatformGTK.cmake (185805 => 185806)
--- trunk/Tools/WebKitTestRunner/PlatformGTK.cmake 2015-06-21 10:06:14 UTC (rev 185805)
+++ trunk/Tools/WebKitTestRunner/PlatformGTK.cmake 2015-06-21 13:15:54 UTC (rev 185806)
@@ -20,6 +20,9 @@
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}
