From d275f0984521e28e9bc8fc98446d16ac79d29dc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Sun, 31 May 2015 18:46:08 +0200 Subject: [PATCH] Fix GL/GLU detection on older distributions This resolves Bug 2155 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: François Andriot --- ConfigureChecks.cmake | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 18e2b5014..5860b88d6 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -297,13 +297,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 )