Merge r223045 - [WPE][GTK] Propagate libepoxy compiler flags obtained…

… from pkg-config https://bugs.webkit.org/show_bug.cgi?id=178081 Reviewed by Carlos Alberto Lopez Perez. .: * Source/cmake/FindLibEpoxy.cmake: Define the ${LIBEPOXY_DEFINITIONS} variable when libepoxy is found by pkg-config. This contains the value of the "Cflags" field from "epoxy.pc". Source/WebCore: No new tests needed. * CMakeLists.txt: Use ${LIBEPOXY_DEFINITIONS} for building WebCore. Source/WebKit: * CMakeLists.txt: Use ${LIBEPOXY_DEFINITIONS} for building WebKit.
WebKit · Oct 17, 2017 · b568052 · b568052
1 parent c6b027a
commit b568052
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 0 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,13 @@
+2017-10-09  Adrian Perez de Castro  <aperez@igalia.com>
+
+        [WPE][GTK] Propagate libepoxy compiler flags obtained from pkg-config
+        https://bugs.webkit.org/show_bug.cgi?id=178081
+
+        Reviewed by Carlos Alberto Lopez Perez.
+
+        * Source/cmake/FindLibEpoxy.cmake: Define the ${LIBEPOXY_DEFINITIONS} variable when libepoxy
+        is found by pkg-config. This contains the value of the "Cflags" field from "epoxy.pc".
+
 2017-10-05  Carlos Alberto Lopez Perez  <clopez@igalia.com>
 
         Generate a compile error if release is built without compiler optimizations

diff --git a/Source/WebCore/CMakeLists.txt b/Source/WebCore/CMakeLists.txt
@@ -3389,6 +3389,7 @@ if (ENABLE_GRAPHICS_CONTEXT_3D)
         list(APPEND WebCore_LIBRARIES
             ${LIBEPOXY_LIBRARIES}
         )
+        add_definitions(${LIBEPOXY_DEFINITIONS})
     else ()
         if (USE_OPENGL)
             list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2017-10-09  Adrian Perez de Castro  <aperez@igalia.com>
+
+        [WPE][GTK] Propagate libepoxy compiler flags obtained from pkg-config
+        https://bugs.webkit.org/show_bug.cgi?id=178081
+
+        Reviewed by Carlos Alberto Lopez Perez.
+
+        No new tests needed.
+
+        * CMakeLists.txt: Use ${LIBEPOXY_DEFINITIONS} for building WebCore.
+
 2017-10-08  Brent Fulgham  <bfulgham@apple.com>
 
         Nullptr deref in WebCore::Node::computeEditability

diff --git a/Source/WebKit/CMakeLists.txt b/Source/WebKit/CMakeLists.txt
@@ -710,6 +710,7 @@ if (ENABLE_GRAPHICS_CONTEXT_3D)
         list(APPEND WebKit2_LIBRARIES
             ${LIBEPOXY_LIBRARIES}
         )
+        add_definitions(${LIBEPOXY_DEFINITIONS})
     else ()
         if (USE_OPENGL)
             list(APPEND WebKit2_SYSTEM_INCLUDE_DIRECTORIES

diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2017-10-09  Adrian Perez de Castro  <aperez@igalia.com>
+
+        [WPE][GTK] Propagate libepoxy compiler flags obtained from pkg-config
+        https://bugs.webkit.org/show_bug.cgi?id=178081
+
+        Reviewed by Carlos Alberto Lopez Perez.
+
+        * CMakeLists.txt: Use ${LIBEPOXY_DEFINITIONS} for building WebKit.
+
 2017-10-04  Adrian Perez de Castro  <aperez@igalia.com>
 
         [GTK] WebKit2GTK+ does not handle touchmove and touchend events correctly

diff --git a/Source/cmake/FindLibEpoxy.cmake b/Source/cmake/FindLibEpoxy.cmake
@@ -30,6 +30,10 @@
 find_package(PkgConfig)
 pkg_check_modules(PC_LIBEPOXY QUIET epoxy)
 
+if (PC_LIBEPOXY_FOUND)
+    set(LIBEPOXY_DEFINITIONS ${PC_LIBEPOXY_CFLAGS_OTHER})
+endif ()
+
 find_path(LIBEPOXY_INCLUDE_DIRS
     NAMES epoxy/gl.h
     PATHS ${PC_LIBEPOXY_INCLUDEDIR} ${PC_LIBEPOXY_INCLUDE_DIRS}