Kaynağa Gözat

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
leha-bot 3 yıl önce
ebeveyn
işleme
a2fc4b6257
1 değiştirilmiş dosya ile 3 ekleme ve 8 silme
  1. 3 8
      Modules/FindGLUT.cmake

+ 3 - 8
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)