From e746f14d4dac3bf3747d7dd15ebada46788cfd41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Lind?= Date: Tue, 16 Dec 2014 10:31:39 +0100 Subject: [PATCH] Add default path to CFLAGS for OpenGL MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As of 6cec75a730f95f1f87e7cbdb5eae5ebae06d93e3 we use pkg-config to pickup OpenGL. Some OpenGL implementations list additional directories to be used as include directories in CFLAGS. Up until now, if this has been empty, then the default path has been used. Now that there may be additional directories, the default include path is not used, which causes gl.h to be picked up. Task-number: QTBUG-43377 Change-Id: I86e995cb8d718724a75d9f3f5713e87451fd7129 Reviewed-by: Simo Fält --- src/gui/Qt5GuiConfigExtras.cmake.in | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in index 9a846d435e..07869efd7d 100644 --- a/src/gui/Qt5GuiConfigExtras.cmake.in +++ b/src/gui/Qt5GuiConfigExtras.cmake.in @@ -57,9 +57,6 @@ set(Qt5Gui_OPENGL_LIBRARIES Qt5::Gui_GLESv2) set(_GL_INCDIRS $$CMAKE_GL_INCDIRS) find_path(_qt5gui_OPENGL_INCLUDE_DIR $$CMAKE_GL_HEADER_NAME PATHS ${_GL_INCDIRS} -!!IF !mac - NO_DEFAULT_PATH -!!ENDIF ) if (NOT _qt5gui_OPENGL_INCLUDE_DIR) message(FATAL_ERROR \"Failed to find \\\"$$CMAKE_GL_HEADER_NAME\\\" in \\\"${_GL_INCDIRS}\\\".\")