From 1709b226df9e03b13fa1c4f0e3525e6346c69d99 Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Sun, 23 Mar 2025 20:49:28 +0100
Subject: [PATCH] Fix using GL and WebView when using cmake install

Add missing wxgl and wxwebview headers to file list to ensure that they
are installed correctly by cmake.

See #25259.

Closes #25266.
---
 Makefile.in                            |  1 +
 build/bakefiles/files.bkl              |  1 +
 build/cmake/files.cmake                | 11 ++++++++---
 build/cmake/lib/webview/CMakeLists.txt |  6 +-----
 build/files                            |  8 ++++++--
 docs/changes.txt                       |  1 +
 6 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 056bd470144a..49deccbbafa0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2370,6 +2370,7 @@ COND_TOOLKIT_MSW_WEBVIEW_HDR_PLATFORM =  \
 @COND_TOOLKIT_MOTIF@OPENGL_HDR_PLATFORM = wx/x11/glcanvas.h wx/unix/glx11.h
 @COND_TOOLKIT_MSW@OPENGL_HDR_PLATFORM = wx/msw/glcanvas.h
 @COND_TOOLKIT_OSX_COCOA@OPENGL_HDR_PLATFORM = wx/osx/glcanvas.h
+@COND_TOOLKIT_OSX_IPHONE@OPENGL_HDR_PLATFORM = wx/osx/glcanvas.h
 @COND_TOOLKIT_QT@OPENGL_HDR_PLATFORM = wx/qt/glcanvas.h
 @COND_TOOLKIT_X11@OPENGL_HDR_PLATFORM = wx/x11/glcanvas.h wx/unix/glx11.h
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@AUI_GTK_HDR = wx/aui/tabartgtk.h
diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index baddf814d58e..50d04aca7f1c 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -3243,6 +3243,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <set var="OPENGL_HDR_PLATFORM" hints="files">
     <if cond="TOOLKIT=='OSX_COCOA'">wx/osx/glcanvas.h</if>
+    <if cond="TOOLKIT=='OSX_IPHONE'">wx/osx/glcanvas.h</if>
     <if cond="TOOLKIT=='COCOA'">wx/cocoa/glcanvas.h</if>
     <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='4'">
         wx/gtk/glcanvas.h
diff --git a/build/cmake/files.cmake b/build/cmake/files.cmake
index b71799f9bc0c..630cc14119bd 100644
--- a/build/cmake/files.cmake
+++ b/build/cmake/files.cmake
@@ -2874,9 +2874,6 @@ set(WEBVIEW_GTK_HDR
 
 set(WEBVIEW_GTK_SRC
     src/gtk/webview_webkit.cpp
-)
-
-set(WEBVIEW2_GTK_SRC
     src/gtk/webview_webkit2.cpp
 )
 
@@ -3071,11 +3068,19 @@ set(OPENGL_OSX_COCOA_SRC
     src/osx/glcanvas_osx.cpp
 )
 
+set(OPENGL_OSX_COCOA_HDR
+    wx/osx/glcanvas.h
+)
+
 set(OPENGL_OSX_IPHONE_SRC
     src/osx/iphone/glcanvas.mm
     src/osx/glcanvas_osx.cpp
 )
 
+set(OPENGL_OSX_IPHONE_HDR
+    wx/osx/glcanvas.h
+)
+
 set(UNIX_SOUND_SDL_SRC
     src/unix/sound_sdl.cpp
 )
diff --git a/build/cmake/lib/webview/CMakeLists.txt b/build/cmake/lib/webview/CMakeLists.txt
index d8bf88459826..2cb35e70d88f 100644
--- a/build/cmake/lib/webview/CMakeLists.txt
+++ b/build/cmake/lib/webview/CMakeLists.txt
@@ -30,11 +30,7 @@ wx_append_sources(WEBVIEW_FILES WEBVIEW_CMN)
 if(WXMSW)
     wx_append_sources(WEBVIEW_FILES WEBVIEW_MSW)
 elseif(WXGTK)
-    if(wxUSE_WEBVIEW_WEBKIT2)
-        wx_append_sources(WEBVIEW_FILES WEBVIEW2_GTK)
-    elseif(wxUSE_WEBVIEW_WEBKIT)
-        wx_append_sources(WEBVIEW_FILES WEBVIEW_GTK)
-    endif()
+    wx_append_sources(WEBVIEW_FILES WEBVIEW_GTK)
 elseif(APPLE)
     wx_append_sources(WEBVIEW_FILES WEBVIEW_OSX_SHARED)
 endif()
diff --git a/build/files b/build/files
index 77ada584edd5..3139393eb415 100644
--- a/build/files
+++ b/build/files
@@ -2818,8 +2818,6 @@ WEBVIEW_GTK_HDR =
 
 WEBVIEW_GTK_SRC =
     src/gtk/webview_webkit.cpp
-
-WEBVIEW2_GTK_SRC =
     src/gtk/webview_webkit2.cpp
 
 WEBVIEW_WEBKIT2_EXTENSION_SRC =
@@ -3009,10 +3007,16 @@ OPENGL_OSX_COCOA_SRC =
     src/osx/cocoa/glcanvas.mm
     src/osx/glcanvas_osx.cpp
 
+OPENGL_OSX_COCOA_HDR =
+    wx/osx/glcanvas.h
+
 OPENGL_OSX_IPHONE_SRC =
     src/osx/iphone/glcanvas.mm
     src/osx/glcanvas_osx.cpp
 
+OPENGL_OSX_IPHONE_HDR =
+    wx/osx/glcanvas.h
+
 # Misc plugin sources:
 
 UNIX_SOUND_SDL_SRC =