Attachment 2298 Details for Bug 2155 – tdebase: fix GL/GLU detection

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release.

[patch] tdebase: fix GL/GLU detection

tdebase-14.0.0-fix_gl_detect.patch (text/plain), 1.16 KB, created by Francois Andriot on 2014-10-11 09:38:25 CDT

(hide)

Description:

Filename:

MIME Type:

Creator: Francois Andriot

Created: 2014-10-11 09:38:25 CDT

Size: 1.16 KB

patch

obsolete

>diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
>index 6e35ca7..c5d724b 100644
>--- a/ConfigureChecks.cmake
>+++ b/ConfigureChecks.cmake
>@@ -237,13 +237,23 @@ if( WITH_OPENGL )
>       tde_message_fatal( "opengl is requested and found, but it doesn't provides glXChooseVisual() or GL/glx.h" )
>     endif( )
>   else( )
>-    tde_message_fatal( "opengl is requested, but not found on your system" )
>+    check_library_exists( GL glXChooseVisual "" HAVE_GLXCHOOSEVISUAL )
>+    if( HAVE_GLXCHOOSEVISUAL )
>+      set( GL_LIBRARIES "GL" )
>+    else( HAVE_GLXCHOOSEVISUAL )
>+      tde_message_fatal( "opengl is requested, but not found on your system" )
>+    endif( HAVE_GLXCHOOSEVISUAL )
>   endif( )
> 
>   if( BUILD_KCONTROL )
>     pkg_search_module( GLU glu )
>     if( NOT GLU_FOUND )
>-      tde_message_fatal( "glu is required, but not found on your system" )
>+      check_library_exists( GLU gluGetString "" HAVE_GLUGETSTRING )
>+      if( HAVE_GLUGETSTRING )
>+        set( GLU_LIBRARIES "GLU" )
>+      else( HAVE_GLUGETSTRING )
>+        tde_message_fatal( "glu is required, but not found on your system" )
>+      endif( HAVE_GLUGETSTRING )
>     endif( )
>   endif( BUILD_KCONTROL )
>

Actions: View | Diff

Attachments on bug 2155: 2298