mirror of
https://github.com/thead-yocto-mirror/meta-qt5
synced 2026-09-18 05:01:56 +02:00
43 lines
1.5 KiB
Diff
43 lines
1.5 KiB
Diff
From 276b5046788007bcbc5607046becdd44151960c0 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
|
Date: Thu, 18 Dec 2014 13:41:09 +0100
|
|
Subject: [PATCH 10/12] Make Qt5GuiConfigExtras.cmake find gl(es) include dir
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
In configure QMAKE_INCDIR_OPENGL is set with pkg-config. Without
|
|
PKG_CONFIG_ALLOW_SYSTEM_CFLAGS set, pkg-config returns paths outside
|
|
/usr/include only (in my case /usr/include/libdrm). With NO_DEFAULT_PATH set
|
|
gl(es) include directories cannot be found. Cmake builds depending on
|
|
Qt5Gui error out with
|
|
|
|
| Failed to find "GLES2/gl2.h" in "/usr/include/libdrm"
|
|
|
|
Upstream-Status: submitted [1]
|
|
|
|
[1] https://bugreports.qt-project.org/browse/QTBUG-43445
|
|
|
|
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
|
---
|
|
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 9a846d4..07869ef 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}\\\".\")
|
|
--
|
|
2.3.1
|
|
|