From 8041ca5df0cb7a016f061206abe2466832add0ea Mon Sep 17 00:00:00 2001 From: Letu Ren Date: Wed, 11 May 2022 23:29:26 +0800 Subject: FindGLUT: Fix GLUT_INCLUDE_DIRS with pkg-config and /usr/include Fixes: #23474 --- Modules/FindGLUT.cmake | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Modules/FindGLUT.cmake b/Modules/FindGLUT.cmake index 43041c5..72d4db5 100644 --- a/Modules/FindGLUT.cmake +++ b/Modules/FindGLUT.cmake @@ -96,7 +96,21 @@ endfunction() find_package(PkgConfig QUIET) if(PKG_CONFIG_FOUND) + # 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(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 GLUT_FOUND) pkg_check_modules(GLUT QUIET freeglut) endif() -- cgit v0.12