From 3fa84fff8d537dd30b7111066b17289f59aad782 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Micha=C3=ABl=20Celerier?= Date: Wed, 24 Jun 2020 10:24:15 +0200 Subject: rhi: fix rendertarget manual test invalid build files Change-Id: I7f2ea8e4e474daaeff132427ff90089984b2d471 Reviewed-by: Paul Lemire --- tests/manual/rendertarget-cpp/CMakeLists.txt | 45 ++++++++-------------- tests/manual/rendertarget-cpp/main.cpp | 1 - tests/manual/rendertarget-cpp/rendertarget-cpp.pro | 4 +- 3 files changed, 18 insertions(+), 32 deletions(-) (limited to 'tests/manual') diff --git a/tests/manual/rendertarget-cpp/CMakeLists.txt b/tests/manual/rendertarget-cpp/CMakeLists.txt index 5fa98149b..97cfb0fe9 100644 --- a/tests/manual/rendertarget-cpp/CMakeLists.txt +++ b/tests/manual/rendertarget-cpp/CMakeLists.txt @@ -1,34 +1,21 @@ # Generated from rendertarget-cpp.pro. -cmake_minimum_required(VERSION 3.14) -project(rendertarget-cpp LANGUAGES CXX) +##################################################################### +## rendertarget-cpp Binary: +##################################################################### -set(CMAKE_INCLUDE_CURRENT_DIR ON) - -set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) -set(CMAKE_AUTOUIC ON) - -set(INSTALL_EXAMPLEDIR "examples") - -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) - -add_qt_gui_executable(rendertarget-cpp - main.cpp - orbittransformcontroller.cpp orbittransformcontroller.h -) -target_link_libraries(rendertarget-cpp PUBLIC - Qt::3DCore - Qt::3DExtras - Qt::3DInput - Qt::3DRender - Qt::Core - Qt::Gui +qt_add_manual_test(rendertarget-cpp + GUI + SOURCES + main.cpp + orbittransformcontroller.cpp orbittransformcontroller.h + PUBLIC_LIBRARIES + Qt::3DCore + Qt::3DExtras + Qt::3DInput + Qt::3DRender + Qt::Gui ) -install(TARGETS rendertarget-cpp - RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" - BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" - LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" -) +## Scopes: +##################################################################### diff --git a/tests/manual/rendertarget-cpp/main.cpp b/tests/manual/rendertarget-cpp/main.cpp index 4a80840f4..7e621a591 100644 --- a/tests/manual/rendertarget-cpp/main.cpp +++ b/tests/manual/rendertarget-cpp/main.cpp @@ -76,7 +76,6 @@ #include #include #include -#include #include #include #include diff --git a/tests/manual/rendertarget-cpp/rendertarget-cpp.pro b/tests/manual/rendertarget-cpp/rendertarget-cpp.pro index cf01c1242..b11894b60 100644 --- a/tests/manual/rendertarget-cpp/rendertarget-cpp.pro +++ b/tests/manual/rendertarget-cpp/rendertarget-cpp.pro @@ -1,5 +1,5 @@ -!include( ../examples.pri ) { - error( "Couldn't find the examples.pri file!" ) +!include( ../manual.pri ) { + error( "Couldn't find the manual.pri file!" ) } QT += 3dcore 3drender 3dinput 3dextras -- cgit v1.2.3