Title: [223045] trunk
- Revision
- 223045
- Author
- [email protected]
- Date
- 2017-10-09 09:04:40 -0700 (Mon, 09 Oct 2017)
Log Message
[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.
Modified Paths
Diff
Modified: trunk/ChangeLog (223044 => 223045)
--- trunk/ChangeLog 2017-10-09 12:53:11 UTC (rev 223044)
+++ trunk/ChangeLog 2017-10-09 16:04:40 UTC (rev 223045)
@@ -1,3 +1,13 @@
+2017-10-09 Adrian Perez de Castro <[email protected]>
+
+ [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 Frederic Wang <[email protected]>
Remove WOFF2 from Source/ThirdParty.
Modified: trunk/Source/WebCore/CMakeLists.txt (223044 => 223045)
--- trunk/Source/WebCore/CMakeLists.txt 2017-10-09 12:53:11 UTC (rev 223044)
+++ trunk/Source/WebCore/CMakeLists.txt 2017-10-09 16:04:40 UTC (rev 223045)
@@ -3485,6 +3485,7 @@
list(APPEND WebCore_LIBRARIES
${LIBEPOXY_LIBRARIES}
)
+ add_definitions(${LIBEPOXY_DEFINITIONS})
else ()
if (USE_OPENGL)
list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
Modified: trunk/Source/WebCore/ChangeLog (223044 => 223045)
--- trunk/Source/WebCore/ChangeLog 2017-10-09 12:53:11 UTC (rev 223044)
+++ trunk/Source/WebCore/ChangeLog 2017-10-09 16:04:40 UTC (rev 223045)
@@ -1,3 +1,14 @@
+2017-10-09 Adrian Perez de Castro <[email protected]>
+
+ [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-09 Romain Bellessort <[email protected]>
[Readable Streams API] Implement canCloseOrEnqueue
Modified: trunk/Source/WebKit/CMakeLists.txt (223044 => 223045)
--- trunk/Source/WebKit/CMakeLists.txt 2017-10-09 12:53:11 UTC (rev 223044)
+++ trunk/Source/WebKit/CMakeLists.txt 2017-10-09 16:04:40 UTC (rev 223045)
@@ -736,6 +736,7 @@
list(APPEND WebKit_LIBRARIES
${LIBEPOXY_LIBRARIES}
)
+ add_definitions(${LIBEPOXY_DEFINITIONS})
else ()
if (USE_OPENGL)
list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES
Modified: trunk/Source/WebKit/ChangeLog (223044 => 223045)
--- trunk/Source/WebKit/ChangeLog 2017-10-09 12:53:11 UTC (rev 223044)
+++ trunk/Source/WebKit/ChangeLog 2017-10-09 16:04:40 UTC (rev 223045)
@@ -1,3 +1,12 @@
+2017-10-09 Adrian Perez de Castro <[email protected]>
+
+ [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-08 Tim Horton <[email protected]>
mediaPlaybackRequiresUserAction API replacement annotation is wrong
Modified: trunk/Source/cmake/FindLibEpoxy.cmake (223044 => 223045)
--- trunk/Source/cmake/FindLibEpoxy.cmake 2017-10-09 12:53:11 UTC (rev 223044)
+++ trunk/Source/cmake/FindLibEpoxy.cmake 2017-10-09 16:04:40 UTC (rev 223045)
@@ -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}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
