Changeset 227090 in webkit


Ignore:
Timestamp:
Jan 17, 2018 3:18:17 PM (6 years ago)
Author:
Michael Catanzaro
Message:

WEBKIT_FRAMEWORK should not modify file-global include directories
​https://bugs.webkit.org/show_bug.cgi?id=181656

Reviewed by Konstantin Tokarev.

.:

Only modify the system include directories of the target passed to WEBKIT_FRAMEWORK.

  • Source/cmake/WebKitMacros.cmake:

Source/WebCore:

  • CMakeLists.txt:
  • PlatformWPE.cmake:

Source/WebKit:

  • PlatformGTK.cmake:
  • PlatformWPE.cmake:

Tools:

  • TestWebKitAPI/PlatformWPE.cmake:
  • TestWebKitAPI/glib/CMakeLists.txt:
Location:
trunk
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r227058 r227090  
     12018-01-17  Michael Catanzaro  <mcatanzaro@igalia.com>
     2
     3        WEBKIT_FRAMEWORK should not modify file-global include directories
     4        https://bugs.webkit.org/show_bug.cgi?id=181656
     5
     6        Reviewed by Konstantin Tokarev.
     7
     8        Only modify the system include directories of the target passed to WEBKIT_FRAMEWORK.
     9
     10        * Source/cmake/WebKitMacros.cmake:
     11
    1122018-01-17  Carlos Garcia Campos  <cgarcia@igalia.com>
    213

  • trunk/Source/WebCore/CMakeLists.txt

    r227049 r227090  
    19501950add_dependencies(WebCoreTestSupport WebCore WebCoreTestSupportBindings)
    19511951target_include_directories(WebCoreTestSupport PUBLIC ${WebCoreTestSupport_INCLUDE_DIRECTORIES} ${WebCore_INCLUDE_DIRECTORIES})
     1952target_include_directories(WebCoreTestSupport SYSTEM PUBLIC ${WebCore_SYSTEM_INCLUDE_DIRECTORIES})
    19521953target_link_libraries(WebCoreTestSupport ${WebCoreTestSupport_LIBRARIES})
    19531954

  • trunk/Source/WebCore/ChangeLog

    r227089 r227090  
     12018-01-17  Michael Catanzaro  <mcatanzaro@igalia.com>
     2
     3        WEBKIT_FRAMEWORK should not modify file-global include directories
     4        https://bugs.webkit.org/show_bug.cgi?id=181656
     5
     6        Reviewed by Konstantin Tokarev.
     7
     8        * CMakeLists.txt:
     9        * PlatformWPE.cmake:
     10
    1112018-01-17  Michael Catanzaro  <mcatanzaro@igalia.com>
    212

  • trunk/Source/WebCore/PlatformWPE.cmake

    r226161 r227090  
    7777)
    7878
    79 list(APPEND WebCore_INCLUDE_DIRECTORIES
     79list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
    8080    ${CAIRO_INCLUDE_DIRS}
    8181    ${GIO_UNIX_INCLUDE_DIRS}

  • trunk/Source/WebKit/ChangeLog

    r227079 r227090  
     12018-01-17  Michael Catanzaro  <mcatanzaro@igalia.com>
     2
     3        WEBKIT_FRAMEWORK should not modify file-global include directories
     4        https://bugs.webkit.org/show_bug.cgi?id=181656
     5
     6        Reviewed by Konstantin Tokarev.
     7
     8        * PlatformGTK.cmake:
     9        * PlatformWPE.cmake:
     10
    1112018-01-17  Youenn Fablet  <youenn@apple.com>
    212

  • trunk/Source/WebKit/PlatformGTK.cmake

    r227049 r227090  
    10611061
    10621062# Commands for building the built-in injected bundle.
    1063 include_directories(
    1064     "${WEBKIT_DIR}/Platform"
    1065     "${WEBKIT_DIR}/Shared"
    1066     "${WEBKIT_DIR}/Shared/API/c"
    1067     "${WEBKIT_DIR}/UIProcess/API/C"
    1068     "${WEBKIT_DIR}/WebProcess/InjectedBundle"
    1069     "${WEBKIT_DIR}/WebProcess/InjectedBundle/API/c"
     1063add_library(webkit2gtkinjectedbundle MODULE "${WEBKIT_DIR}/WebProcess/InjectedBundle/API/glib/WebKitInjectedBundleMain.cpp")
     1064ADD_WEBKIT_PREFIX_HEADER(webkit2gtkinjectedbundle)
     1065target_link_libraries(webkit2gtkinjectedbundle WebKit)
     1066
     1067target_include_directories(webkit2gtkinjectedbundle PRIVATE
     1068    ${WebKit_INCLUDE_DIRECTORIES}
    10701069    "${DERIVED_SOURCES_DIR}/InjectedBundle"
    10711070    "${FORWARDING_HEADERS_DIR}"
    … …  
    10741073)
    10751074
    1076 add_library(webkit2gtkinjectedbundle MODULE "${WEBKIT_DIR}/WebProcess/InjectedBundle/API/glib/WebKitInjectedBundleMain.cpp")
    1077 ADD_WEBKIT_PREFIX_HEADER(webkit2gtkinjectedbundle)
    1078 target_link_libraries(webkit2gtkinjectedbundle WebKit)
     1075target_include_directories(webkit2gtkinjectedbundle SYSTEM PRIVATE
     1076    ${WebKit_SYSTEM_INCLUDE_DIRECTORIES}
     1077)
    10791078
    10801079if (COMPILER_IS_GCC_OR_CLANG)

  • trunk/Source/WebKit/PlatformWPE.cmake

    r226991 r227090  
    482482target_link_libraries(WPEInjectedBundle WebKit)
    483483
     484target_include_directories(WPEInjectedBundle PRIVATE ${WebKit_INCLUDE_DIRECTORIES})
     485target_include_directories(WPEInjectedBundle SYSTEM PRIVATE ${WebKit_SYSTEM_INCLUDE_DIRECTORIES})
     486
    484487install(FILES "${CMAKE_BINARY_DIR}/wpe-webkit.pc"
    485488    DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig"

  • trunk/Source/cmake/WebKitMacros.cmake

    r226442 r227090  
    130130
    131131macro(WEBKIT_FRAMEWORK _target)
    132     include_directories(SYSTEM ${${_target}_SYSTEM_INCLUDE_DIRECTORIES})
    133132    target_sources(${_target} PRIVATE
    134133        ${${_target}_HEADERS}
    … …  
    136135    )
    137136    target_include_directories(${_target} PUBLIC "$<BUILD_INTERFACE:${${_target}_INCLUDE_DIRECTORIES}>")
     137    target_include_directories(${_target} SYSTEM PRIVATE "$<BUILD_INTERFACE:${${_target}_SYSTEM_INCLUDE_DIRECTORIES}>")
    138138    target_include_directories(${_target} PRIVATE "$<BUILD_INTERFACE:${${_target}_PRIVATE_INCLUDE_DIRECTORIES}>")
    139139    target_link_libraries(${_target} ${${_target}_LIBRARIES})

  • trunk/Tools/ChangeLog

    r227083 r227090  
     12018-01-17  Michael Catanzaro  <mcatanzaro@igalia.com>
     2
     3        WEBKIT_FRAMEWORK should not modify file-global include directories
     4        https://bugs.webkit.org/show_bug.cgi?id=181656
     5
     6        Reviewed by Konstantin Tokarev.
     7
     8        * TestWebKitAPI/PlatformWPE.cmake:
     9        * TestWebKitAPI/glib/CMakeLists.txt:
     10
    1112018-01-17  Alicia Boya García  <aboya@igalia.com>
    212

  • trunk/Tools/TestWebKitAPI/PlatformWPE.cmake

    r227049 r227090  
    2020
    2121include_directories(SYSTEM
     22    ${CAIRO_INCLUDE_DIRS}
    2223    ${GLIB_INCLUDE_DIRS}
    2324    ${LIBSOUP_INCLUDE_DIRS}

  • trunk/Tools/TestWebKitAPI/glib/CMakeLists.txt

    r222194 r227090  
    1616
    1717set(WebKitGLibAPITests_SYSTEM_INCLUDE_DIRECTORIES
     18    ${CAIRO_INCLUDE_DIRS}
    1819    ${GLIB_INCLUDE_DIRS}
    1920    ${GSTREAMER_INCLUDE_DIRS}
Note: See TracChangeset for help on using the changeset viewer.