Improve support of Qt + USING_GLES2 #11507
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jbeich
reviewed
Oct 28, 2018
CMakeLists.txt
Outdated
| @@ -784,6 +784,9 @@ elseif(USING_QT_UI) | |||
| Qt/mainwindow.h | |||
| ) | |||
| add_definitions(-DUSING_QT_UI) | |||
| if(USING_GLES2) | |||
| add_definitions(-DQT_OPENGL_ES -DQT_OPENGL_ES_2); | |||
There was a problem hiding this comment.
; (semicolon) at the end of expression breaks build:
CMake Error at CMakeLists.txt:788:
Parse error. Expected a command name, got unquoted argument with text ";".
There was a problem hiding this comment.
Derp.
-[Unknown]
See hrydgard#11495 - thanks to Jan Beich.
unknownbrackets
force-pushed
the
qt-cmake
branch
from
9d0a4fb
to
f81dd83
Compare
|
v1.7 + this PR builds fine: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See #11495 - it seems that Qt's configure would normally add this if you specify
es2, and we already load gl3stub after, so forcing gles2 should be ideal for us. Not actually tested.I don't know if this prevents us from using desktop GL, since ideally we'd be dynamic, but it fixes build errors.
Additionally, pulled the bandaid off for CMakeLists.txt in a separate commit. These rules seemed prevailing:
if(set(-[Unknown]