Changeset 185806 in webkit


Ignore:
Timestamp:
Jun 21, 2015 6:15:54 AM (9 years ago)
Author:
Michael Catanzaro
Message:

[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:
Location:
trunk/Tools
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • trunk/Tools/ChangeLog

    r185801 r185806  
     12015-06-21  Michael Catanzaro  <mcatanzaro@igalia.com>
     2
     3        [CMake] Ignore warnings from system headers when compiling Tools
     4        https://bugs.webkit.org/show_bug.cgi?id=146185
     5
     6        Reviewed by Martin Robinson.
     7
     8        Use the SYSTEM argument to the include_directories() command to silence compiler warnings
     9        from system headers that we don't control.
     10
     11        * DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt:
     12        * ImageDiff/CMakeLists.txt: Also, remove an EFL include directory from here...
     13        * ImageDiff/PlatformEfl.cmake: ...and put it here where it belongs.
     14        * ImageDiff/PlatformGTK.cmake:
     15        * MiniBrowser/efl/CMakeLists.txt:
     16        * MiniBrowser/gtk/CMakeLists.txt:
     17        * TestWebKitAPI/PlatformEfl.cmake:
     18        * TestWebKitAPI/PlatformGTK.cmake:
     19        * TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt:
     20        * WebKitTestRunner/CMakeLists.txt:
     21        * WebKitTestRunner/PlatformEfl.cmake:
     22        * WebKitTestRunner/PlatformGTK.cmake:
     23
    1242015-06-20  Michael Catanzaro  <mcatanzaro@igalia.com>
    225

  • trunk/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt

    r185056 r185806  
    3434    ${WEBKIT_TESTNETSCAPEPLUGIN_DIR}/unix/ForwardingHeaders
    3535    ${WEBCORE_DIR}
     36)
     37
     38set(WebKitTestNetscapePlugin_SYSTEM_INCLUDE_DIRECTORIES
    3639    ${X11_INCLUDE_DIR}
    3740)
    3841
    3942include_directories(${WebKitTestNetscapePlugin_INCLUDE_DIRECTORIES})
     43include_directories(SYSTEM ${WebKitTestNetscapePlugin_SYSTEM_INCLUDE_DIRECTORIES})
    4044
    4145set(WebKitTestNetscapePlugin_LIBRARIES

  • trunk/Tools/ImageDiff/CMakeLists.txt

    r182103 r185806  
    33set(IMAGE_DIFF_INCLUDE_DIRECTORIES
    44    ${CMAKE_BINARY_DIR}
    5     ${ECORE_IMF_INCLUDE_DIRS}
    65    ${WTF_DIR}
    76)
     7
     8set(IMAGE_DIFF_SYSTEM_INCLUDE_DIRECTORIES "")
    89
    910set(IMAGE_DIFF_LIBRARIES
    … …  
    1415
    1516include_directories(${IMAGE_DIFF_INCLUDE_DIRECTORIES})
     17include_directories(SYSTEM ${IMAGE_DIFF_SYSTEM_INCLUDE_DIRECTORIES})
    1618add_executable(ImageDiff ${IMAGE_DIFF_SOURCES})
    1719target_link_libraries(ImageDiff ${IMAGE_DIFF_LIBRARIES})

  • trunk/Tools/ImageDiff/PlatformEfl.cmake

    r182165 r185806  
    33)
    44
    5 list(APPEND IMAGE_DIFF_INCLUDE_DIRECTORIES
     5list(APPEND IMAGE_DIFF_SYSTEM_INCLUDE_DIRECTORIES
    66    ${ECORE_EVAS_INCLUDE_DIRS}
     7    ${ECORE_IMF_INCLUDE_DIRS}
    78)
    89

  • trunk/Tools/ImageDiff/PlatformGTK.cmake

    r163155 r185806  
    33)
    44
    5 list(APPEND IMAGE_DIFF_INCLUDE_DIRECTORIES
     5list(APPEND IMAGE_DIFF_SYSTEM_INCLUDE_DIRECTORIES
    66    ${GTK_INCLUDE_DIRS}
    77)

  • trunk/Tools/MiniBrowser/efl/CMakeLists.txt

    r176555 r185806  
    1212
    1313set(MiniBrowser_INCLUDE_DIRECTORIES
     14    ${DERIVED_SOURCES_WEBKIT2_DIR}/include
     15    ${WEBKIT2_DIR}/UIProcess/API/efl
     16    ${WEBKIT2_DIR}
     17    ${CMAKE_SOURCE_DIR}/Source
     18)
     19
     20set(MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES
    1421    ${CAIRO_INCLUDE_DIRS}
    15     ${DERIVED_SOURCES_WEBKIT2_DIR}/include
    1622    ${ECORE_INCLUDE_DIRS}
    1723    ${ECORE_EVAS_INCLUDE_DIRS}
    … …  
    3137    ${ETHUMB_CLIENT_INCLUDE_DIRS}
    3238    ${EVAS_INCLUDE_DIRS}
    33     ${WEBKIT2_DIR}/UIProcess/API/efl
    34     ${WEBKIT2_DIR}
    35     ${CMAKE_SOURCE_DIR}/Source
    3639)
    3740
    … …  
    6265if (ELEMENTARY_FOUND)
    6366    include_directories(${MiniBrowser_INCLUDE_DIRECTORIES})
     67    include_directories(SYSTEM ${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES})
    6468    add_executable(MiniBrowser ${MiniBrowser_SOURCES})
    6569    target_link_libraries(MiniBrowser ${MiniBrowser_LIBRARIES})

  • trunk/Tools/MiniBrowser/gtk/CMakeLists.txt

    r185801 r185806  
    2626    ${FORWARDING_HEADERS_DIR}
    2727    ${CMAKE_SOURCE_DIR}/Source
     28)
     29
     30set(MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES
    2831    ${GTK3_INCLUDE_DIRS}
    2932    ${GLIB_INCLUDE_DIRS}
    … …  
    5356
    5457include_directories(${MiniBrowser_INCLUDE_DIRECTORIES})
     58include_directories(SYSTEM ${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES})
    5559add_executable(MiniBrowser ${MiniBrowser_SOURCES})
    5660target_link_libraries(MiniBrowser ${MiniBrowser_LIBRARIES})

  • trunk/Tools/TestWebKitAPI/PlatformEfl.cmake

    r185358 r185806  
    1212    ${WEBKIT2_DIR}/UIProcess/API/C/efl
    1313    ${WEBKIT2_DIR}/UIProcess/API/efl
     14)
     15
     16include_directories(SYSTEM
    1417    ${ECORE_EVAS_INCLUDE_DIRS}
    1518    ${GLIB_INCLUDE_DIRS}

  • trunk/Tools/TestWebKitAPI/PlatformGTK.cmake

    r185502 r185806  
    1616    ${WEBKIT2_DIR}/UIProcess/API/C/gtk
    1717    ${WEBKIT2_DIR}/UIProcess/API/gtk
     18)
     19
     20include_directories(SYSTEM
    1821    ${GDK3_INCLUDE_DIRS}
    1922    ${GLIB_INCLUDE_DIRS}
    … …  
    2124    ${LIBSOUP_INCLUDE_DIRS}
    2225)
     26
    2327set(test_main_SOURCES
    2428    ${TESTWEBKITAPI_DIR}/gtk/main.cpp

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt

    r176563 r185806  
    2222    ${FORWARDING_HEADERS_WEBKIT2GTK_EXTENSION_DIR}
    2323    ${TOOLS_DIR}/TestWebKitAPI/gtk/WebKit2Gtk
     24)
     25
     26include_directories(SYSTEM
    2427    ${ATSPI_INCLUDE_DIRS}
    2528    ${GLIB_INCLUDE_DIRS}

  • trunk/Tools/WebKitTestRunner/CMakeLists.txt

    r182103 r185806  
    5050    ${CMAKE_BINARY_DIR}
    5151    ${CMAKE_SOURCE_DIR}/Source
     52)
     53
     54set(WebKitTestRunner_SYSTEM_INCLUDE_DIRECTORIES
    5255    ${LIBSOUP_INCLUDE_DIRS}
    5356)
    … …  
    9598
    9699include_directories(${WebKitTestRunner_INCLUDE_DIRECTORIES})
     100include_directories(SYSTEM ${WebKitTestRunner_SYSTEM_INCLUDE_DIRECTORIES})
    97101
    98102add_library(TestRunnerInjectedBundle SHARED ${WebKitTestRunnerInjectedBundle_SOURCES})

  • trunk/Tools/WebKitTestRunner/PlatformEfl.cmake

    r183369 r185806  
    1616    ${DERIVED_SOURCES_WEBKIT2_DIR}/include
    1717    ${WEBKIT2_DIR}/UIProcess/API/efl
     18)
     19
     20list(APPEND WebKitTestRunner_SYSTEM_INCLUDE_DIRECTORIES
    1821    ${CAIRO_INCLUDE_DIRS}
    1922    ${ECORE_INCLUDE_DIRS}

  • trunk/Tools/WebKitTestRunner/PlatformGTK.cmake

    r185502 r185806  
    2121    ${FORWARDING_HEADERS_DIR}
    2222    ${WTF_DIR}/wtf/glib
     23)
     24
     25list(APPEND WebKitTestRunner_SYSTEM_INCLUDE_DIRECTORIES
    2326    ${ATK_INCLUDE_DIRS}
    2427    ${CAIRO_INCLUDE_DIRS}
Note: See TracChangeset for help on using the changeset viewer.