Changeset 220326 in webkit


Ignore:
Timestamp:
Aug 6, 2017 4:34:58 PM (7 years ago)
Author:
clopez@igalia.com
Message:

[GTK][WPE] CFLAGS from pkg-config for (E)GL are not passed to WebKit
https://bugs.webkit.org/show_bug.cgi?id=175125

Reviewed by Michael Catanzaro.

Some platforms define cflags on the (E)GL pkg-config files that we
need to pass to the build system when including the (E)GL headers.
And we are already doing this when building WebCore (after r184954).

But now we need to do this also on WebKit (former WebKit2) because
we include (E)GL headers (and make use of them) on the UIProcess.

  • CMakeLists.txt:
Location:
trunk/Source/WebKit
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit/CMakeLists.txt

    r220094 r220326  
    9292
    9393if (ENABLE_GRAPHICS_CONTEXT_3D)
     94    # For platforms that want to use system-provided OpenGL (ES) / EGL headers,
     95    # these include directories, libraries or definitions need to be
     96    # added before the ANGLE directories.
     97    if (USE_OPENGL)
     98        list(APPEND WebKit2_SYSTEM_INCLUDE_DIRECTORIES
     99            ${OPENGL_INCLUDE_DIRS}
     100        )
     101        list(APPEND WebKit2_LIBRARIES
     102            ${OPENGL_LIBRARIES}
     103        )
     104        add_definitions(${OPENGL_DEFINITIONS})
     105    elseif (USE_OPENGL_ES_2)
     106        list(APPEND WebKit2_SYSTEM_INCLUDE_DIRECTORIES
     107            ${OPENGLES2_INCLUDE_DIRS}
     108        )
     109        list(APPEND WebKit2_LIBRARIES
     110            ${OPENGLES2_LIBRARIES}
     111        )
     112        add_definitions(${OPENGLES2_DEFINITIONS})
     113    endif ()
     114
     115    if (USE_EGL)
     116        list(APPEND WebKit2_SYSTEM_INCLUDE_DIRECTORIES
     117            ${EGL_INCLUDE_DIRS}
     118        )
     119        list(APPEND WebKit2_LIBRARIES
     120            ${EGL_LIBRARIES}
     121        )
     122        add_definitions(${EGL_DEFINITIONS})
     123    endif ()
     124
    94125    list(APPEND WebKit2_INCLUDE_DIRECTORIES
    95126        "${THIRDPARTY_DIR}/ANGLE"
  • trunk/Source/WebKit/ChangeLog

    r220317 r220326  
     12017-08-06  Carlos Alberto Lopez Perez  <clopez@igalia.com>
     2
     3        [GTK][WPE] CFLAGS from pkg-config for (E)GL are not passed to WebKit
     4        https://bugs.webkit.org/show_bug.cgi?id=175125
     5
     6        Reviewed by Michael Catanzaro.
     7
     8        Some platforms define cflags on the (E)GL pkg-config files that we
     9        need to pass to the build system when including the (E)GL headers.
     10        And we are already doing this when building WebCore (after r184954).
     11
     12        But now we need to do this also on WebKit (former WebKit2) because
     13        we include (E)GL headers (and make use of them) on the UIProcess.
     14
     15        * CMakeLists.txt:
     16
    1172017-08-05  Carlos Garcia Campos  <cgarcia@igalia.com>
    218
Note: See TracChangeset for help on using the changeset viewer.