diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-01-27 13:25:34 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-01-30 20:45:08 +0000 |
| commit | 43d2b60a29df5397be4b4bead90f40346bf85dce (patch) | |
| tree | 7ac735998206e9ed76eca98d335490ad5d98bd1f /examples/gui | |
| parent | a1dbdcbd6e818118f5fc28cdd39e47a02380adbd (diff) | |
Post-merge fixes
Change-Id: I6acd29103f6cc550544e7422328d97ea0e2dcafb
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'examples/gui')
| -rw-r--r-- | examples/gui/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | examples/gui/openglwindow/CMakeLists.txt | 32 |
2 files changed, 3 insertions, 36 deletions
diff --git a/examples/gui/CMakeLists.txt b/examples/gui/CMakeLists.txt index 7ae4c6bc6a..7631777ef4 100644 --- a/examples/gui/CMakeLists.txt +++ b/examples/gui/CMakeLists.txt @@ -1,8 +1,7 @@ # Generated from gui.pro. +if(NOT TARGET Qt::Gui) + return() +endif() add_subdirectory(analogclock) add_subdirectory(rasterwindow) - -if(TARGET Qt::Gui AND QT_FEATURE_opengl) - add_subdirectory(openglwindow) -endif() diff --git a/examples/gui/openglwindow/CMakeLists.txt b/examples/gui/openglwindow/CMakeLists.txt deleted file mode 100644 index 98fc40fd9a..0000000000 --- a/examples/gui/openglwindow/CMakeLists.txt +++ /dev/null @@ -1,32 +0,0 @@ -# Generated from openglwindow.pro. - -cmake_minimum_required(VERSION 3.14) -project(openglwindow LANGUAGES CXX) - -find_package(Qt6 COMPONENTS Widgets) # special case: add - -set(CMAKE_INCLUDE_CURRENT_DIR ON) - -set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) -set(CMAKE_AUTOUIC ON) - -set(INSTALL_EXAMPLEDIR "examples") - -add_qt_gui_executable(openglwindow - main.cpp - openglwindow.cpp openglwindow.h -) -target_include_directories(openglwindow PUBLIC - ${CMAKE_CURRENT_SOURCE_DIR} -) -# special case begin -target_link_libraries(openglwindow PUBLIC - Qt::Gui -) -# special case end -install(TARGETS openglwindow - RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" - BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" - LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" -) |