From a60a33dcb082c029a28f46346e1a21b95f85e4e5 Mon Sep 17 00:00:00 2001 From: leha-bot Date: Thu, 13 Oct 2022 15:03:33 +0300 Subject: 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 --- Modules/FindGLUT.cmake | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'Modules/FindGLUT.cmake') diff --git a/Modules/FindGLUT.cmake b/Modules/FindGLUT.cmake index 902c843e9c..725a1d08d7 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() -- cgit v1.2.1