FLTK logo

[master] 2356c9d - CMake build for Wayland: check for presence of required GL-related software

FLTK matrix user chat room
(using Element browser app)   FLTK gitter user chat room   GitHub FLTK Project   FLTK News RSS Feed  
  FLTK Apps      FLTK Library      Forums      Links     Login 
 All Forums  |  Back to fltk.commit  ]
 
Previous Message ]Next Message ]

[master] 2356c9d - CMake build for Wayland: check for presence of required GL-related software "ManoloFLTK" Nov 24, 2022  
 
commit 2356c9dcd6a78a3ec8fce3ab1647e771fb674a71
Author:     ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>
AuthorDate: Thu Nov 24 09:08:46 2022 +0100
Commit:     ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>
CommitDate: Thu Nov 24 09:08:46 2022 +0100

    CMake build for Wayland: check for presence of required GL-related software

 CMake/options.cmake | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git CMake/options.cmake CMake/options.cmake
index 8d27c11..094d444 100644
--- CMake/options.cmake
+++ CMake/options.cmake
@@ -445,11 +445,13 @@ endif (HAVE_GL)
 
 if (OPTION_USE_GL)
   if (OPTION_USE_WAYLAND)
-    pkg_check_modules(WLDEGL wayland-egl)
-    if (NOT WLDEGL_FOUND)
-      message (STATUS "Module 'wayland-egl' is required to build for the Wayland backend.")
+    pkg_check_modules(WLD_EGL wayland-egl)
+    pkg_check_modules(PKG_EGL egl)
+    pkg_check_modules(PKG_GL gl)
+    if (NOT (WLD_EGL_FOUND AND PKG_EGL_FOUND AND PKG_GL_FOUND))
+      message (STATUS "Modules 'wayland-egl, egl, and gl' are required to build for the Wayland backend.")
       message (FATAL_ERROR "*** Aborting ***")
-    endif (NOT WLDEGL_FOUND)
+    endif (NOT (WLD_EGL_FOUND AND PKG_EGL_FOUND AND PKG_GL_FOUND))
   endif (OPTION_USE_WAYLAND)
   if (OPTION_APPLE_X11)
     set (OPENGL_FOUND TRUE)
Direct Link to Message ]
 
     
Previous Message ]Next Message ]
 
 

Comments are owned by the poster. All other content is copyright 1998-2024 by Bill Spitzak and others. This project is hosted by The FLTK Team. Please report site problems to 'erco@seriss.com'.