mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-12-31 10:50:16 -06:00
Code Issues Packages Projects Releases Wiki Activity

FindGLUT: Drop the now-unnecessary exclusion of pkg-config for multiconfig

Browse Source 
Revert commit e0a62b84b5 (FindGLUT: On Windows and with multiple config
generator do not use pkg-config, 2022-09-27, v3.25.0-rc1~69^2). We now
call `select_library_configurations()` even after using pkg-config,
which will handle the absent libraries on Debug/Release configurations.

Issue: #24028
This commit is contained in:
leha-bot
2022-10-13 15:08:17 +03:00
committed by Brad King
parent a60a33dcb0
commit a2fc4b6257
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Modules/FindGLUT.cmake
View File

@@ -68,14 +68,9 @@ include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
find_package(PkgConfig QUIET)
get_property(_isMultiConfig GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
# On WIN32 and when using a multiple config generator, pkg-config
# is not used as it cannot distinguish between release and debug libraries
if(PKG_CONFIG_FOUND AND NOT (_isMultiConfig AND WIN32))
pkg_check_modules(PC_GLUT QUIET glut)
if(NOT PC_GLUT_FOUND)
pkg_check_modules(PC_GLUT QUIET freeglut)
endif()
pkg_check_modules(PC_GLUT QUIET glut)
if(NOT PC_GLUT_FOUND)
pkg_check_modules(PC_GLUT QUIET freeglut)
endif()
if(WIN32)