qt5base-CMake-don-t-require-GL-when-build-with-no-opengl.patch 1.1 KB

12345678910111213141516171819202122232425262728
  1. From 02edc30764935d64f0994a9c592ca729f1c37410 Mon Sep 17 00:00:00 2001
  2. From: =?UTF-8?q?Peter=20K=C3=BCmmel?= <syntheticpp@gmx.net>
  3. Date: Fri, 31 Jan 2014 22:28:19 +0100
  4. Subject: [PATCH] CMake: don't require GL when build with -no-opengl
  5. Task-number: QTBUG-36509
  6. Change-Id: I03451527ab91754d87ff2a43985952c7c7641826
  7. Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
  8. ---
  9. src/gui/gui.pro | 2 +-
  10. 1 file changed, 1 insertion(+), 1 deletion(-)
  11. diff --git a/src/gui/gui.pro b/src/gui/gui.pro
  12. index 3203b41..f4c35a3 100644
  13. --- a/src/gui/gui.pro
  14. +++ b/src/gui/gui.pro
  15. @@ -81,7 +81,7 @@ contains(QT_CONFIG, angle) {
  16. !isEmpty(QMAKE_LIBDIR_OPENGL_ES2): CMAKE_OPENGL_LIBDIR = $$cmakePortablePaths($$QMAKE_LIBDIR_OPENGL_ES2)
  17. CMAKE_GL_HEADER_NAME = GLES2/gl2.h
  18. CMAKE_QT_OPENGL_IMPLEMENTATION = GLESv2
  19. - } else {
  20. + } else:contains(QT_CONFIG, opengl) {
  21. !isEmpty(QMAKE_INCDIR_OPENGL): CMAKE_GL_INCDIRS = $$cmakeTargetPaths($$QMAKE_INCDIR_OPENGL)
  22. CMAKE_OPENGL_INCDIRS = $$cmakePortablePaths($$QMAKE_INCDIR_OPENGL)
  23. CMAKE_OPENGL_LIBS = $$cmakeProcessLibs($$QMAKE_LIBS_OPENGL)
  24. --
  25. 1.8.3.2