dilim/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-08-03 14:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'FindGLUT-pkg-config' into release-3.25

Browse Source 
919ab832e8 FindGLUT: Fix regression when pkg-config is not available

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7840
This commit is contained in:
Brad King
2022-10-28 13:59:51 +00:00
committed by Kitware Robot
parent 4910efb178 919ab832e8
commit 59ae254316
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Modules/FindGLUT.cmake
View File

@@ -68,9 +68,11 @@ include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
find_package(PkgConfig QUIET)
pkg_check_modules(PC_GLUT QUIET glut)
if(NOT PC_GLUT_FOUND)
pkg_check_modules(PC_GLUT QUIET freeglut)
if(PKG_CONFIG_FOUND)
pkg_check_modules(PC_GLUT QUIET glut)
if(NOT PC_GLUT_FOUND)
pkg_check_modules(PC_GLUT QUIET freeglut)
endif()
endif()
if(WIN32)