diff options
| author | leha-bot <leha-bot@yandex.ru> | 2022-10-13 12:03:33 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-10-13 14:04:41 (GMT) |
| commit | a60a33dcb082c029a28f46346e1a21b95f85e4e5 (patch) | |
| tree | 225614d0b691e907c95fa660f47f3916b7003571 | |
| parent | 4ad57224b515024264340c18b5b03240e100849d (diff) | |
| download | CMake-a60a33dcb082c029a28f46346e1a21b95f85e4e5.zip CMake-a60a33dcb082c029a28f46346e1a21b95f85e4e5.tar.gz CMake-a60a33dcb082c029a28f46346e1a21b95f85e4e5.tar.bz2 | |
FindGLUT: Drop the now-unnecessary ALLOW_SYSTEM_CFLAGS logic
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
| -rw-r--r-- | Modules/FindGLUT.cmake | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/Modules/FindGLUT.cmake b/Modules/FindGLUT.cmake index 902c843..725a1d0 100644 --- a/Modules/FindGLUT.cmake +++ b/Modules/FindGLUT.cmake @@ -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() |