From a2fc4b62574dbf44dd2ba2d7e8568857a570c3cd Mon Sep 17 00:00:00 2001 From: leha-bot Date: Thu, 13 Oct 2022 15:08:17 +0300 Subject: FindGLUT: Drop the now-unnecessary exclusion of pkg-config for multiconfig 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 --- Modules/FindGLUT.cmake | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/Modules/FindGLUT.cmake b/Modules/FindGLUT.cmake index 725a1d0..e0636b2 100644 --- a/Modules/FindGLUT.cmake +++ b/Modules/FindGLUT.cmake @@ -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) -- cgit v0.12