diff options
| author | leha-bot <leha-bot@yandex.ru> | 2022-10-13 15:08:17 +0300 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-10-13 10:06:57 -0400 |
| commit | a2fc4b62574dbf44dd2ba2d7e8568857a570c3cd (patch) | |
| tree | 039b09928b83c03a4726fd0af1ee58819b7c1cee | |
| parent | a60a33dcb082c029a28f46346e1a21b95f85e4e5 (diff) | |
| download | cmake-a2fc4b62574dbf44dd2ba2d7e8568857a570c3cd.tar.gz | |
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
| -rw-r--r-- | Modules/FindGLUT.cmake | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/Modules/FindGLUT.cmake b/Modules/FindGLUT.cmake index 725a1d08d7..e0636b2f86 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) |