Link with GLU when using EGL too in CMake build.

Also build all samples in the CMake CI builds.

See https://github.com/wxWidgets/wxWidgets/pull/2543
This commit is contained in:
Vadim Zeitlin
2021-10-12 00:39:54 +02:00
2 changed files with 2 additions and 1 deletions

View File

@@ -52,6 +52,7 @@ jobs:
- name: Ubuntu 18.04 wxGTK 3
runner: ubuntu-18.04
cmake_generator: Unix Makefiles
cmake_samples: ALL
- name: macOS 10.15 wxOSX
runner: macos-10.15
cmake_generator: Xcode

View File

@@ -411,7 +411,7 @@ if(wxUSE_GUI)
else()
find_package(OpenGL)
if(WXGTK3 AND OpenGL_EGL_FOUND AND wxUSE_GLCANVAS_EGL)
set(OPENGL_LIBRARIES OpenGL::OpenGL OpenGL::EGL)
set(OPENGL_LIBRARIES OpenGL::OpenGL OpenGL::GLU OpenGL::EGL)
find_package(WAYLANDEGL)
if(WAYLANDEGL_FOUND AND wxHAVE_GDK_WAYLAND)
list(APPEND OPENGL_LIBRARIES ${WAYLANDEGL_LIBRARIES})