diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-07-08 15:48:46 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-07-13 22:07:46 +0200 |
commit | ee0198a0183ec2b0cd9ddc6663110cd8e40320aa (patch) | |
tree | 74cb7cc1bbd982200480f66dc1057f71f837675b /src/gui/CMakeLists.txt | |
parent | 70f7155fcc20e43f096a029889d8a8117e11f70d (diff) |
Move eglconvenience to QtGui
Task-number: QTBUG-83255
Change-Id: I8a008d8906308dd73a0793db5b88d3a1b6fdaf5c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/gui/CMakeLists.txt')
-rw-r--r-- | src/gui/CMakeLists.txt | 46 |
1 files changed, 43 insertions, 3 deletions
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index bca7b4ad7c..7d78ecb282 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -410,6 +410,23 @@ qt_extend_target(Gui CONDITION WIN32 #### Keys ignored in scope 7:.:.:gui.pro:WIN32: # CMAKE_WINDOWS_BUILD = "True" +# special case begin +if(QT_FEATURE_egl) + qt_find_package(EGL) +endif() +# special case end + +qt_extend_target(Gui CONDITION QT_FEATURE_egl + SOURCES + opengl/platform/egl/qeglconvenience.cpp opengl/platform/egl/qeglconvenience_p.h + opengl/platform/egl/qeglstreamconvenience.cpp opengl/platform/egl/qeglstreamconvenience_p.h + opengl/platform/egl/qt_egl_p.h +# special case begin + LIBRARIES + EGL::EGL # special case +# special case end +) + #### Keys ignored in scope 8:.:.:gui.pro:QT_FEATURE_egl: # CMAKE_EGL_LIBS = "$$cmakeProcessLibs($$QMAKE_LIBS_EGL)" @@ -793,6 +810,29 @@ qt_extend_target(Gui CONDITION QT_FEATURE_opengl AND QT_FEATURE_xlib AND NOT QT_ X11::X11 ) +qt_extend_target(Gui CONDITION QT_FEATURE_egl AND QT_FEATURE_opengl + SOURCES + opengl/platform/egl/qeglpbuffer.cpp opengl/platform/egl/qeglpbuffer_p.h + opengl/platform/egl/qeglplatformcontext.cpp opengl/platform/egl/qeglplatformcontext_p.h +) + +qt_extend_target(Gui CONDITION QT_FEATURE_egl AND QT_FEATURE_egl_x11 + SOURCES + opengl/platform/egl/qxlibeglintegration.cpp opengl/platform/egl/qxlibeglintegration_p.h + LIBRARIES + X11::X11 +) + +qt_extend_target(Gui CONDITION QT_FEATURE_egl AND NOT QT_FEATURE_egl_x11 + DEFINES + QT_EGL_NO_X11 +) + +qt_extend_target(Gui CONDITION QT_FEATURE_dlopen AND QT_FEATURE_egl + LIBRARIES + ${CMAKE_DL_LIBS} +) + qt_extend_target(Gui CONDITION QT_FEATURE_vulkan SOURCES rhi/qrhivulkan.cpp rhi/qrhivulkan_p.h @@ -806,7 +846,7 @@ qt_extend_target(Gui CONDITION QT_FEATURE_vulkan Vulkan::Vulkan_nolink ) -#### Keys ignored in scope 99:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vkgen: +#### Keys ignored in scope 110:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vkgen: # special case begin # We must always generate syncqt-injected header files, # because we added a custom command earlier for those for framework builds. @@ -862,10 +902,10 @@ add_custom_command( # qvkgen_pimpl.input = "QMAKE_QVKGEN_INPUT" # qvkgen_pimpl.output = "$$OUT_PWD/vulkan/qvulkanfunctions_p.cpp" -#### Keys ignored in scope 105:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vulkan: +#### Keys ignored in scope 111:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vulkan: # qvkgen_h.variable_out = "HEADERS" -#### Keys ignored in scope 106:.:vulkan:vulkan/vulkan.pri:else: +#### Keys ignored in scope 112:.:vulkan:vulkan/vulkan.pri:else: # qvkgen_h.CONFIG = "target_predeps" "no_link" qt_extend_target(Gui CONDITION WASM |