aboutsummaryrefslogtreecommitdiffstats
path: root/examples/quick/rendercontrol/rendercontrol_opengl/CMakeLists.txt
diff options
context:
space:
mode:
authorOliver Eftevaag <oliver.eftevaag@qt.io>2021-11-11 13:03:39 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-11-16 08:41:36 +0000
commit12c6285bf8cd1bab3f1c69a1ee6d7747c38310dd (patch)
tree03982d58356c22378bfd2a9f37264d9be93ff6fb /examples/quick/rendercontrol/rendercontrol_opengl/CMakeLists.txt
parent89ef09d95fd0ae73ad9dc83def93b46855a60901 (diff)
Rendercontrol example: use new cmake api
Updating the CMakeLists.txt files in the d3d11 and opengl version of the example to use the new qt_add_qml_module() function instead of the old qt_add_resources() Task-number: QTBUG-98130 Change-Id: Ida43e4b0c875951a85d754b3a96f88366b580e24 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit 88dfbe0deaa780f1cb5793d644341367d02e3073) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'examples/quick/rendercontrol/rendercontrol_opengl/CMakeLists.txt')
-rw-r--r--examples/quick/rendercontrol/rendercontrol_opengl/CMakeLists.txt39
1 files changed, 11 insertions, 28 deletions
diff --git a/examples/quick/rendercontrol/rendercontrol_opengl/CMakeLists.txt b/examples/quick/rendercontrol/rendercontrol_opengl/CMakeLists.txt
index 2ac8eaf1eb..e15de24f08 100644
--- a/examples/quick/rendercontrol/rendercontrol_opengl/CMakeLists.txt
+++ b/examples/quick/rendercontrol/rendercontrol_opengl/CMakeLists.txt
@@ -1,13 +1,9 @@
-# Generated from rendercontrol_opengl.pro.
-
cmake_minimum_required(VERSION 3.16)
project(rendercontrol_opengl LANGUAGES CXX)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTORCC ON)
-set(CMAKE_AUTOUIC ON)
if(NOT DEFINED INSTALL_EXAMPLESDIR)
set(INSTALL_EXAMPLESDIR "examples")
@@ -15,22 +11,14 @@ endif()
set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/rendercontrol/rendercontrol_opengl")
-find_package(Qt6 COMPONENTS Core)
-find_package(Qt6 COMPONENTS Gui)
-find_package(Qt6 COMPONENTS Quick)
-find_package(Qt6 COMPONENTS Qml)
-find_package(Qt6 COMPONENTS OpenGL)
+find_package(Qt6 COMPONENTS Core Gui Quick Qml OpenGL)
-qt_add_executable(rendercontrol_opengl
- cuberenderer.cpp cuberenderer.h
+qt_add_executable(rendercontrol_openglexample WIN32 MACOSX_BUNDLE
+ cuberenderer.cpp
main.cpp
- window_singlethreaded.cpp window_singlethreaded.h
-)
-set_target_properties(rendercontrol_opengl PROPERTIES
- WIN32_EXECUTABLE TRUE
- MACOSX_BUNDLE TRUE
+ window_singlethreaded.cpp
)
-target_link_libraries(rendercontrol_opengl PUBLIC
+target_link_libraries(rendercontrol_openglexample PUBLIC
Qt::Core
Qt::Gui
Qt::OpenGL
@@ -38,20 +26,15 @@ target_link_libraries(rendercontrol_opengl PUBLIC
Qt::Quick
)
-
# Resources:
-set(rendercontrol_resource_files
- "demo.qml"
-)
-
-qt6_add_resources(rendercontrol_opengl "rendercontrol"
- PREFIX
- "/rendercontrol"
- FILES
- ${rendercontrol_resource_files}
+qt_add_qml_module(rendercontrol_openglexample
+ URI rendercontrol
+ VERSION 1.0
+ QML_FILES
+ "demo.qml"
)
-install(TARGETS rendercontrol_opengl
+install(TARGETS rendercontrol_openglexample
RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"