28 lines
1.1 KiB
Diff
28 lines
1.1 KiB
Diff
--- CMakeLists.txt.orig 2018-07-01 08:04:19.000000000 +0200
|
|
+++ CMakeLists.txt 2018-07-17 08:52:24.193931980 +0200
|
|
@@ -418,24 +418,6 @@
|
|
ADD_DEFINITIONS(-DUSE_OLD_QGLWIDGET)
|
|
ENDIF()
|
|
|
|
-# Since Qt 5.4, linking to OpenGL is basically not required anymore,
|
|
-# because the QtGui module re-implements the GL functions, and perhaps even
|
|
-# dispatches the calls to a dynamically selected GL library.
|
|
-#
|
|
-# The only exception where this does not work with CMake is for
|
|
-# ES2-only/ANGLE-only builds, which are seemingly not included in
|
|
-# official Qt downloads, but may be required as a custom build
|
|
-# for some embedded systems. Interestingly, this works with qmake,
|
|
-# but CMake needs an explicit link definition.
|
|
-# See also this bug: https://bugreports.qt.io/browse/QTBUG-29132
|
|
-
|
|
-# Check if we have a GLES-only build
|
|
-# On dynamic builds, this property is also "GL"
|
|
-IF(${Qt5Gui_OPENGL_IMPLEMENTATION} MATCHES "GLES")
|
|
- MESSAGE(STATUS "Building an OpenGL ES build (${Qt5Gui_OPENGL_IMPLEMENTATION})")
|
|
- SET(STEL_GLES_LIBS Qt5::Gui_EGL Qt5::Gui_GLESv2)
|
|
-ENDIF()
|
|
-
|
|
|
|
# Tell CMake to run moc when necessary:
|
|
SET(CMAKE_AUTOMOC ON)
|