mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-05 13:20:47 -06:00
Code Issues Packages Projects Releases Wiki Activity

FindGLUT: Drop the now-unnecessary ALLOW_SYSTEM_CFLAGS logic

Browse Source 
Revert commit 8041ca5df0 (FindGLUT: Fix GLUT_INCLUDE_DIRS with
pkg-config and /usr/include, 2022-05-11, v3.24.0-rc1~151^2).
As the main code path will always do `find_path()` which respects the
`CMAKE_FIND_ROOT_PATH_MODE_INCLUDE` variable and will search in system
paths depending on that variable.

Issue: #23474, #24028
This commit is contained in:
leha-bot
2022-10-13 15:03:33 +03:00
committed by Brad King
parent 4ad57224b5
commit a60a33dcb0
1 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Modules/FindGLUT.cmake
View File

@@ -72,21 +72,7 @@ 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})
set(_pkgconfig_allow_system_cflags_old "$ENV{PKG_CONFIG_ALLOW_SYSTEM_CFLAGS}")
else()
unset(_pkgconfig_allow_system_cflags_old)
endif()
set(ENV{PKG_CONFIG_ALLOW_SYSTEM_CFLAGS} 1)
pkg_check_modules(PC_GLUT QUIET glut)
if(DEFINED _pkgconfig_allow_system_cflags_old)
set(ENV{PKG_CONFIG_ALLOW_SYSTEM_CFLAGS} "${_pkgconfig_allow_system_cflags_old}")
unset(_pkgconfig_allow_system_cflags_old)
else()
unset(ENV{PKG_CONFIG_ALLOW_SYSTEM_CFLAGS})
endif()
if(NOT PC_GLUT_FOUND)
pkg_check_modules(PC_GLUT QUIET freeglut)
endif()