Title: [220334] trunk/Source
- Revision
- 220334
- Author
- clo...@igalia.com
- Date
- 2017-08-07 08:44:14 -0700 (Mon, 07 Aug 2017)
Log Message
[WPE][CMake] Only pass pkg-config CFLAGS from (E)GL when not using libepoxy.
https://bugs.webkit.org/show_bug.cgi?id=175125
Reviewed by Michael Catanzaro.
Source/WebCore:
No change of behavior, covered by existing tests.
* CMakeLists.txt: Instead of negating 3 times the use of libepoxy
move the logic for (E)GL detection inside an else() block.
Source/WebKit:
* CMakeLists.txt: When using libepoxy avoid passing the CFLAGS from (E)GL,
and instead pass the libepoxy ones.
Modified Paths
Diff
Modified: trunk/Source/WebCore/CMakeLists.txt (220333 => 220334)
--- trunk/Source/WebCore/CMakeLists.txt 2017-08-07 13:14:18 UTC (rev 220333)
+++ trunk/Source/WebCore/CMakeLists.txt 2017-08-07 15:44:14 UTC (rev 220334)
@@ -3386,34 +3386,6 @@
# For platforms that want to use system-provided OpenGL (ES) / EGL headers,
# these include directories, libraries or definitions need to be
# added before the ANGLE directories.
- if (USE_OPENGL AND NOT USE_LIBEPOXY)
- list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
- ${OPENGL_INCLUDE_DIRS}
- )
- list(APPEND WebCore_LIBRARIES
- ${OPENGL_LIBRARIES}
- )
- add_definitions(${OPENGL_DEFINITIONS})
- elseif (USE_OPENGL_ES_2 AND NOT USE_LIBEPOXY)
- list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
- ${OPENGLES2_INCLUDE_DIRS}
- )
- list(APPEND WebCore_LIBRARIES
- ${OPENGLES2_LIBRARIES}
- )
- add_definitions(${OPENGLES2_DEFINITIONS})
- endif ()
-
- if (USE_EGL AND NOT USE_LIBEPOXY)
- list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
- ${EGL_INCLUDE_DIRS}
- )
- list(APPEND WebCore_LIBRARIES
- ${EGL_LIBRARIES}
- )
- add_definitions(${EGL_DEFINITIONS})
- endif ()
-
if (USE_LIBEPOXY)
list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
${LIBEPOXY_INCLUDE_DIRS}
@@ -3421,6 +3393,34 @@
list(APPEND WebCore_LIBRARIES
${LIBEPOXY_LIBRARIES}
)
+ else ()
+ if (USE_OPENGL)
+ list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
+ ${OPENGL_INCLUDE_DIRS}
+ )
+ list(APPEND WebCore_LIBRARIES
+ ${OPENGL_LIBRARIES}
+ )
+ add_definitions(${OPENGL_DEFINITIONS})
+ elseif (USE_OPENGL_ES_2)
+ list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
+ ${OPENGLES2_INCLUDE_DIRS}
+ )
+ list(APPEND WebCore_LIBRARIES
+ ${OPENGLES2_LIBRARIES}
+ )
+ add_definitions(${OPENGLES2_DEFINITIONS})
+ endif ()
+
+ if (USE_EGL)
+ list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
+ ${EGL_INCLUDE_DIRS}
+ )
+ list(APPEND WebCore_LIBRARIES
+ ${EGL_LIBRARIES}
+ )
+ add_definitions(${EGL_DEFINITIONS})
+ endif ()
endif ()
list(APPEND WebCore_INCLUDE_DIRECTORIES
Modified: trunk/Source/WebCore/ChangeLog (220333 => 220334)
--- trunk/Source/WebCore/ChangeLog 2017-08-07 13:14:18 UTC (rev 220333)
+++ trunk/Source/WebCore/ChangeLog 2017-08-07 15:44:14 UTC (rev 220334)
@@ -1,3 +1,15 @@
+2017-08-07 Carlos Alberto Lopez Perez <clo...@igalia.com>
+
+ [WPE][CMake] Only pass pkg-config CFLAGS from (E)GL when not using libepoxy.
+ https://bugs.webkit.org/show_bug.cgi?id=175125
+
+ Reviewed by Michael Catanzaro.
+
+ No change of behavior, covered by existing tests.
+
+ * CMakeLists.txt: Instead of negating 3 times the use of libepoxy
+ move the logic for (E)GL detection inside an else() block.
+
2017-08-07 Antti Koivisto <an...@apple.com>
REGRESSION (r219121): Airmail 3 prints header part only.
Modified: trunk/Source/WebKit/CMakeLists.txt (220333 => 220334)
--- trunk/Source/WebKit/CMakeLists.txt 2017-08-07 13:14:18 UTC (rev 220333)
+++ trunk/Source/WebKit/CMakeLists.txt 2017-08-07 15:44:14 UTC (rev 220334)
@@ -702,32 +702,41 @@
# For platforms that want to use system-provided OpenGL (ES) / EGL headers,
# these include directories, libraries or definitions need to be
# added before the ANGLE directories.
- if (USE_OPENGL)
+ if (USE_LIBEPOXY)
list(APPEND WebKit2_SYSTEM_INCLUDE_DIRECTORIES
- ${OPENGL_INCLUDE_DIRS}
+ ${LIBEPOXY_INCLUDE_DIRS}
)
list(APPEND WebKit2_LIBRARIES
- ${OPENGL_LIBRARIES}
+ ${LIBEPOXY_LIBRARIES}
)
- add_definitions(${OPENGL_DEFINITIONS})
- elseif (USE_OPENGL_ES_2)
- list(APPEND WebKit2_SYSTEM_INCLUDE_DIRECTORIES
- ${OPENGLES2_INCLUDE_DIRS}
- )
- list(APPEND WebKit2_LIBRARIES
- ${OPENGLES2_LIBRARIES}
- )
- add_definitions(${OPENGLES2_DEFINITIONS})
- endif ()
+ else ()
+ if (USE_OPENGL)
+ list(APPEND WebKit2_SYSTEM_INCLUDE_DIRECTORIES
+ ${OPENGL_INCLUDE_DIRS}
+ )
+ list(APPEND WebKit2_LIBRARIES
+ ${OPENGL_LIBRARIES}
+ )
+ add_definitions(${OPENGL_DEFINITIONS})
+ elseif (USE_OPENGL_ES_2)
+ list(APPEND WebKit2_SYSTEM_INCLUDE_DIRECTORIES
+ ${OPENGLES2_INCLUDE_DIRS}
+ )
+ list(APPEND WebKit2_LIBRARIES
+ ${OPENGLES2_LIBRARIES}
+ )
+ add_definitions(${OPENGLES2_DEFINITIONS})
+ endif ()
- if (USE_EGL)
- list(APPEND WebKit2_SYSTEM_INCLUDE_DIRECTORIES
- ${EGL_INCLUDE_DIRS}
- )
- list(APPEND WebKit2_LIBRARIES
- ${EGL_LIBRARIES}
- )
- add_definitions(${EGL_DEFINITIONS})
+ if (USE_EGL)
+ list(APPEND WebKit2_SYSTEM_INCLUDE_DIRECTORIES
+ ${EGL_INCLUDE_DIRS}
+ )
+ list(APPEND WebKit2_LIBRARIES
+ ${EGL_LIBRARIES}
+ )
+ add_definitions(${EGL_DEFINITIONS})
+ endif ()
endif ()
list(APPEND WebKit2_INCLUDE_DIRECTORIES
Modified: trunk/Source/WebKit/ChangeLog (220333 => 220334)
--- trunk/Source/WebKit/ChangeLog 2017-08-07 13:14:18 UTC (rev 220333)
+++ trunk/Source/WebKit/ChangeLog 2017-08-07 15:44:14 UTC (rev 220334)
@@ -1,5 +1,15 @@
2017-08-07 Carlos Alberto Lopez Perez <clo...@igalia.com>
+ [WPE][CMake] Only pass pkg-config CFLAGS from (E)GL when not using libepoxy.
+ https://bugs.webkit.org/show_bug.cgi?id=175125
+
+ Reviewed by Michael Catanzaro.
+
+ * CMakeLists.txt: When using libepoxy avoid passing the CFLAGS from (E)GL,
+ and instead pass the libepoxy ones.
+
+2017-08-07 Carlos Alberto Lopez Perez <clo...@igalia.com>
+
[GTK][WPE] CFLAGS from pkg-config for (E)GL are not passed to WebKit
https://bugs.webkit.org/show_bug.cgi?id=175125
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
