Ver Fonte

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

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

Acked-by: Kitware Robot <[email protected]>
Merge-request: !7840
Brad King há 3 anos atrás
pai
commit
59ae254316
1 ficheiros alterados com 5 adições e 3 exclusões
  1. 5 3
      Modules/FindGLUT.cmake

+ 5 - 3
Modules/FindGLUT.cmake

@@ -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)