From 28f59e8900c3a54d4fe6bce43f62d1c4b0070e2c Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Mon, 11 Oct 2021 12:43:52 -0400 Subject: [PATCH 1/2] cmake: also link with GLU when using EGL Fixes #19282 --- build/cmake/init.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/cmake/init.cmake b/build/cmake/init.cmake index e1426afd42..d5ecda9c98 100644 --- a/build/cmake/init.cmake +++ b/build/cmake/init.cmake @@ -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}) From 769e24bae0b78df663027f4d3fb0fbc126630cd3 Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Mon, 11 Oct 2021 13:03:15 -0400 Subject: [PATCH 2/2] cmake: build all samples under Linux CI --- .github/workflows/ci_cmake.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci_cmake.yml b/.github/workflows/ci_cmake.yml index 755fdd7123..29b3eac844 100644 --- a/.github/workflows/ci_cmake.yml +++ b/.github/workflows/ci_cmake.yml @@ -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