mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-06 14:19:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'traversaro-master-patch-54928'

Browse Source 
e0a62b84b5 FindGLUT: On Windows and with multiple config generator do not use pkg-config

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7721
This commit is contained in:
Brad King
2022-09-29 11:54:18 +00:00
committed by Kitware Robot
parent beb4f5df47 e0a62b84b5
commit b1ecce8ae7
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/FindGLUT.cmake
+4 -1
View File
@@ -95,7 +95,10 @@ function(_add_glut_target_simple)
endfunction()
find_package(PkgConfig QUIET)
if(PKG_CONFIG_FOUND)
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))
# Tell pkg-config not to strip any -I flags to make sure GLUT_INCLUDE_DIRS
# will be defined.
if(DEFINED ENV{PKG_CONFIG_ALLOW_SYSTEM_CFLAGS})