From 804ce3ee42f3526ddd81d0a603ffc7ef2d434161 Mon Sep 17 00:00:00 2001
From: Mehdi Chinoune <mehdi.chinoune@hotmail.com>
Date: Mon, 11 Apr 2022 06:02:35 +0100
Subject: FindGLUT: Search for "freeglut" first On Windows
---
Modules/FindGLUT.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Modules/FindGLUT.cmake b/Modules/FindGLUT.cmake
index 7a16048..d12a6d2 100644
--- a/Modules/FindGLUT.cmake
+++ b/Modules/FindGLUT.cmake
@@ -111,7 +111,7 @@ if(WIN32)
find_path( GLUT_INCLUDE_DIR NAMES GL/glut.h
PATHS ${GLUT_ROOT_PATH}/include )
mark_as_advanced(GLUT_INCLUDE_DIR)
- find_library( GLUT_glut_LIBRARY_RELEASE NAMES glut glut32 freeglut
+ find_library( GLUT_glut_LIBRARY_RELEASE NAMES freeglut glut glut32
PATHS
${OPENGL_LIBRARY_DIR}
${GLUT_ROOT_PATH}/Release
--
cgit v0.12
From 2c45465ffb4e855ba5c33bb89eb572c621607493 Mon Sep 17 00:00:00 2001
From: Mehdi Chinoune <mehdi.chinoune@hotmail.com>
Date: Mon, 11 Apr 2022 06:03:10 +0100
Subject: FindGLUT: Search for freeglut as well using PkgConfig.
---
Modules/FindGLUT.cmake | 3 +++
1 file changed, 3 insertions(+)
diff --git a/Modules/FindGLUT.cmake b/Modules/FindGLUT.cmake
index d12a6d2..43041c5 100644
--- a/Modules/FindGLUT.cmake
+++ b/Modules/FindGLUT.cmake
@@ -97,6 +97,9 @@ endfunction()
find_package(PkgConfig QUIET)
if(PKG_CONFIG_FOUND)
pkg_check_modules(GLUT QUIET glut)
+ if(NOT GLUT_FOUND)
+ pkg_check_modules(GLUT QUIET freeglut)
+ endif()
if(GLUT_FOUND)
# GLUT_INCLUDE_DIRS is now the official result variable, but
# older versions of CMake only provided GLUT_INCLUDE_DIR.
--
cgit v0.12