Attachment 231705 Details for Bug 260878 – Fix libglut discovery

[patch] Fix libglut discovery

patch-build-cmake-modules-JasOpenGL.cmake (text/plain), 1.39 KB, created by Peter Jeremy on 2022-02-10 08:38:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Peter Jeremy

Created: 2022-02-10 08:38:01 UTC

Size: 1.39 KB

patch

obsolete

>--- build/cmake/modules/JasOpenGL.cmake.orig	2021-08-02 06:39:10.000000000 +1000
>+++ build/cmake/modules/JasOpenGL.cmake	2022-02-10 19:19:07.936160000 +1100
>@@ -4,7 +4,7 @@
> 
> if (JAS_ENABLE_OPENGL)
> 	set(OpenGL_GL_PREFERENCE GLVND)
>-	find_package(OpenGL ${JAS_REQUIRED})
>+	find_package(OpenGL ${JAS_OPENGL_REQUIRED})
> 	message("OpenGL library found: ${OPENGL_FOUND}")
> else()
> 	set(OPENGL_FOUND false)
>@@ -28,22 +28,9 @@
> 			message(WARNING "The header files GL/glut.h and glut.h both appear to be missing.")
> 			message(WARNING "Disabling OpenGL.")
> 		endif()
>-	endif()
>-	# On some systems (e.g., Fedora 21), there is a bug in the cmake code
>-	# that detects GLUT libraries.  The following ugliness is a workaround for 
>-	# this problem.
>-	if (NOT GLUT_Xmu_LIBRARY OR NOT GLUT_Xmi_LIBRARY)
>-		if (NOT GLUT_Xmu_LIBRARY)
>-			set(GLUT_Xmu_LIBRARY "")
>-			message(WARNING "Clearing bogus value for GLUT_Xmu_LIBRARY.")
>-			message(WARNING "Your version of CMake may be buggy.")
>-		endif()
>-		if (NOT GLUT_Xmi_LIBRARY)
>-			set(GLUT_Xmi_LIBRARY "")
>-			message(WARNING "Clearing bogus value for GLUT_Xmi_LIBRARY.")
>-			message(WARNING "Your version of CMake may be buggy.")
>-		endif()
>-		set(GLUT_LIBRARIES "${GLUT_glut_LIBRARY}")
>+		set(OPENGL_LIBRARIES "${OPENGL_LIBRARIES};${pkgcfg_lib_GLUT_glut}")
>+		set(GLUT_LIBRARIES "")
>+		message("Revised OpenGL libraries: ${OPENGL_LIBRARIES}")
> 	endif()
> else()
> 	set(JAS_HAVE_OPENGL 0)

Actions: View | Diff

Attachments on bug 260878: 230624 | 231156 | 231574 | 231705 | 231736