[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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@220334 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/CMakeLists.txt b/Source/WebCore/CMakeLists.txt
index 4a9c75d487feaff5b880e944de498458e341e273..a1a5ea6cd7053ffac12cb5382b9925da594ae1c5 100644 (file)
--- a/Source/WebCore/CMakeLists.txt
+++ b/Source/WebCore/CMakeLists.txt
@@ -3386,34 +3386,6 @@ if (ENABLE_GRAPHICS_CONTEXT_3D)
     # 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 @@ if (ENABLE_GRAPHICS_CONTEXT_3D)
         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

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index fde91d15afadcda41d161b027001ae95d2d65775..64f7313319661a41ca45736c4757884dee8878f2 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2017-08-07  Carlos Alberto Lopez Perez  <clopez@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  <antti@apple.com>
 
         REGRESSION (r219121): Airmail 3 prints header part only.

diff --git a/Source/WebKit/CMakeLists.txt b/Source/WebKit/CMakeLists.txt
index 06927f4032bfc34d904c787226dc7f756d9d6d20..64b5abffb151157a9c3a329b0f9c7c41e0bfc067 100644 (file)
--- a/Source/WebKit/CMakeLists.txt
+++ b/Source/WebKit/CMakeLists.txt
@@ -702,32 +702,41 @@ if (ENABLE_GRAPHICS_CONTEXT_3D)
     # 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

diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
index dc8f348c66caf0e9bca047572bf900973b41a7cd..dd3ea9aa0027d2541c760d7660ab17220c91bff3 100644 (file)
--- a/Source/WebKit/ChangeLog
+++ b/Source/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2017-08-07  Carlos Alberto Lopez Perez  <clopez@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  <clopez@igalia.com>
 
         [GTK][WPE] CFLAGS from pkg-config for (E)GL are not passed to WebKit