From 1339cc46678f475f788c9e86618c3824dd86a7ea Mon Sep 17 00:00:00 2001
From: Alexandru Croitor <alexandru.croitor@qt.io>
Date: Tue, 7 Jul 2020 16:56:37 +0200
Subject: CMake: Regenerate manual tests

Change-Id: Id42b9e481375d2ec0e68b73dc1e2ff36f0cbd49e
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
---
 tests/manual/rhi/CMakeLists.txt                    |  2 +
 .../rhi/compressedtexture_bc1/CMakeLists.txt       |  4 +-
 .../compressedtexture_bc1_subupload/CMakeLists.txt |  4 +-
 tests/manual/rhi/computebuffer/CMakeLists.txt      |  4 +-
 tests/manual/rhi/computeimage/CMakeLists.txt       |  4 +-
 tests/manual/rhi/cubemap/CMakeLists.txt            |  4 +-
 tests/manual/rhi/cubemap_render/CMakeLists.txt     | 35 ++++++++++++++++++
 tests/manual/rhi/cubemap_scissor/CMakeLists.txt    |  4 +-
 .../rhi/float16texture_with_compute/CMakeLists.txt | 43 ++++++++++++++++++++++
 tests/manual/rhi/floattexture/CMakeLists.txt       |  4 +-
 .../hellominimalcrossgfxtriangle/CMakeLists.txt    |  4 +-
 tests/manual/rhi/instancing/CMakeLists.txt         |  4 +-
 tests/manual/rhi/mrt/CMakeLists.txt                |  4 +-
 tests/manual/rhi/msaarenderbuffer/CMakeLists.txt   |  4 +-
 tests/manual/rhi/msaatexture/CMakeLists.txt        |  4 +-
 tests/manual/rhi/multiwindow/CMakeLists.txt        |  4 +-
 .../manual/rhi/multiwindow_threaded/CMakeLists.txt |  4 +-
 tests/manual/rhi/offscreen/CMakeLists.txt          |  4 +-
 tests/manual/rhi/qrhiprof/CMakeLists.txt           |  2 +-
 tests/manual/rhi/shadowmap/CMakeLists.txt          |  4 +-
 tests/manual/rhi/texuploads/CMakeLists.txt         |  4 +-
 tests/manual/rhi/triquadcube/CMakeLists.txt        |  4 +-
 22 files changed, 117 insertions(+), 37 deletions(-)
 create mode 100644 tests/manual/rhi/cubemap_render/CMakeLists.txt
 create mode 100644 tests/manual/rhi/float16texture_with_compute/CMakeLists.txt

(limited to 'tests/manual/rhi')

diff --git a/tests/manual/rhi/CMakeLists.txt b/tests/manual/rhi/CMakeLists.txt
index 621a307304..8f35c98aef 100644
--- a/tests/manual/rhi/CMakeLists.txt
+++ b/tests/manual/rhi/CMakeLists.txt
@@ -8,11 +8,13 @@ add_subdirectory(msaatexture)
 add_subdirectory(msaarenderbuffer)
 add_subdirectory(cubemap)
 add_subdirectory(cubemap_scissor)
+add_subdirectory(cubemap_render)
 add_subdirectory(multiwindow)
 add_subdirectory(multiwindow_threaded)
 add_subdirectory(triquadcube)
 add_subdirectory(offscreen)
 add_subdirectory(floattexture)
+add_subdirectory(float16texture_with_compute)
 add_subdirectory(mrt)
 add_subdirectory(shadowmap)
 add_subdirectory(computebuffer)
diff --git a/tests/manual/rhi/compressedtexture_bc1/CMakeLists.txt b/tests/manual/rhi/compressedtexture_bc1/CMakeLists.txt
index 5da0ad2932..294b6cb942 100644
--- a/tests/manual/rhi/compressedtexture_bc1/CMakeLists.txt
+++ b/tests/manual/rhi/compressedtexture_bc1/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## compressedtexture_bc1 Binary:
 #####################################################################
 
-add_qt_manual_test(compressedtexture_bc1
+qt_add_manual_test(compressedtexture_bc1
     GUI
     SOURCES
         compressedtexture_bc1.cpp
@@ -29,7 +29,7 @@ set(compressedtexture_bc1_resource_files
     "../shared/texture.vert.qsb"
 )
 
-add_qt_resource(compressedtexture_bc1 "compressedtexture_bc1"
+qt_add_resource(compressedtexture_bc1 "compressedtexture_bc1"
     PREFIX
         "/"
     FILES
diff --git a/tests/manual/rhi/compressedtexture_bc1_subupload/CMakeLists.txt b/tests/manual/rhi/compressedtexture_bc1_subupload/CMakeLists.txt
index bd82a5cb0d..508df6b5d5 100644
--- a/tests/manual/rhi/compressedtexture_bc1_subupload/CMakeLists.txt
+++ b/tests/manual/rhi/compressedtexture_bc1_subupload/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## compressedtexture_bc1_subupload Binary:
 #####################################################################
 
-add_qt_manual_test(compressedtexture_bc1_subupload
+qt_add_manual_test(compressedtexture_bc1_subupload
     GUI
     SOURCES
         compressedtexture_bc1_subupload.cpp
@@ -33,7 +33,7 @@ set(compressedtexture_bc1_subupload_resource_files
     "../shared/texture.vert.qsb"
 )
 
-add_qt_resource(compressedtexture_bc1_subupload "compressedtexture_bc1_subupload"
+qt_add_resource(compressedtexture_bc1_subupload "compressedtexture_bc1_subupload"
     PREFIX
         "/"
     FILES
diff --git a/tests/manual/rhi/computebuffer/CMakeLists.txt b/tests/manual/rhi/computebuffer/CMakeLists.txt
index e2a959c1e4..3d19620dce 100644
--- a/tests/manual/rhi/computebuffer/CMakeLists.txt
+++ b/tests/manual/rhi/computebuffer/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## computebuffer Binary:
 #####################################################################
 
-add_qt_manual_test(computebuffer
+qt_add_manual_test(computebuffer
     GUI
     SOURCES
         computebuffer.cpp
@@ -20,7 +20,7 @@ set(computebuffer_resource_files
     "main.vert.qsb"
 )
 
-add_qt_resource(computebuffer "computebuffer"
+qt_add_resource(computebuffer "computebuffer"
     PREFIX
         "/"
     FILES
diff --git a/tests/manual/rhi/computeimage/CMakeLists.txt b/tests/manual/rhi/computeimage/CMakeLists.txt
index a634f1cf98..a5408233d5 100644
--- a/tests/manual/rhi/computeimage/CMakeLists.txt
+++ b/tests/manual/rhi/computeimage/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## computeimage Binary:
 #####################################################################
 
-add_qt_manual_test(computeimage
+qt_add_manual_test(computeimage
     GUI
     SOURCES
         computeimage.cpp
@@ -30,7 +30,7 @@ set(computeimage_resource_files
     "image.comp.qsb"
 )
 
-add_qt_resource(computeimage "computeimage"
+qt_add_resource(computeimage "computeimage"
     PREFIX
         "/"
     FILES
diff --git a/tests/manual/rhi/cubemap/CMakeLists.txt b/tests/manual/rhi/cubemap/CMakeLists.txt
index 323ad78170..6a69d76065 100644
--- a/tests/manual/rhi/cubemap/CMakeLists.txt
+++ b/tests/manual/rhi/cubemap/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## cubemap Binary:
 #####################################################################
 
-add_qt_manual_test(cubemap
+qt_add_manual_test(cubemap
     GUI
     SOURCES
         cubemap.cpp
@@ -20,7 +20,7 @@ set(cubemap_resource_files
     "cubemap.vert.qsb"
 )
 
-add_qt_resource(cubemap "cubemap"
+qt_add_resource(cubemap "cubemap"
     PREFIX
         "/"
     FILES
diff --git a/tests/manual/rhi/cubemap_render/CMakeLists.txt b/tests/manual/rhi/cubemap_render/CMakeLists.txt
new file mode 100644
index 0000000000..c21ebc40a3
--- /dev/null
+++ b/tests/manual/rhi/cubemap_render/CMakeLists.txt
@@ -0,0 +1,35 @@
+# Generated from cubemap_render.pro.
+
+#####################################################################
+## cubemap_render Binary:
+#####################################################################
+
+qt_add_manual_test(cubemap_render
+    GUI
+    SOURCES
+        cubemap_render.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::GuiPrivate
+)
+
+# Resources:
+set(cubemap_render_resource_files
+    "cubemap_mrt.frag.qsb"
+    "cubemap_mrt.vert.qsb"
+    "cubemap_oneface.frag.qsb"
+    "cubemap_oneface.vert.qsb"
+    "cubemap_sample.frag.qsb"
+    "cubemap_sample.vert.qsb"
+)
+
+qt_add_resource(cubemap_render "cubemap_render"
+    PREFIX
+        "/"
+    FILES
+        ${cubemap_render_resource_files}
+)
+
+
+#### Keys ignored in scope 1:.:.:cubemap_render.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/rhi/cubemap_scissor/CMakeLists.txt b/tests/manual/rhi/cubemap_scissor/CMakeLists.txt
index 519d9dc6ec..759c722006 100644
--- a/tests/manual/rhi/cubemap_scissor/CMakeLists.txt
+++ b/tests/manual/rhi/cubemap_scissor/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## cubemap_scissor Binary:
 #####################################################################
 
-add_qt_manual_test(cubemap_scissor
+qt_add_manual_test(cubemap_scissor
     GUI
     SOURCES
         cubemap_scissor.cpp
@@ -29,7 +29,7 @@ set(cubemap_scissor_resource_files
     "../cubemap/cubemap.vert.qsb"
 )
 
-add_qt_resource(cubemap_scissor "cubemap_scissor"
+qt_add_resource(cubemap_scissor "cubemap_scissor"
     PREFIX
         "/"
     FILES
diff --git a/tests/manual/rhi/float16texture_with_compute/CMakeLists.txt b/tests/manual/rhi/float16texture_with_compute/CMakeLists.txt
new file mode 100644
index 0000000000..935f653742
--- /dev/null
+++ b/tests/manual/rhi/float16texture_with_compute/CMakeLists.txt
@@ -0,0 +1,43 @@
+# Generated from float16texture_with_compute.pro.
+
+#####################################################################
+## float16texture_with_compute Binary:
+#####################################################################
+
+qt_add_manual_test(float16texture_with_compute
+    GUI
+    SOURCES
+        float16texture_with_compute.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::GuiPrivate
+)
+
+# Resources:
+set_source_files_properties("../shared/qt256.png"
+    PROPERTIES QT_RESOURCE_ALIAS "qt256.png"
+)
+set_source_files_properties("../shared/texture.frag.qsb"
+    PROPERTIES QT_RESOURCE_ALIAS "texture.frag.qsb"
+)
+set_source_files_properties("../shared/texture.vert.qsb"
+    PROPERTIES QT_RESOURCE_ALIAS "texture.vert.qsb"
+)
+set(float16texture_with_compute_resource_files
+    "../shared/qt256.png"
+    "../shared/texture.frag.qsb"
+    "../shared/texture.vert.qsb"
+    "load.comp.qsb"
+    "prefilter.comp.qsb"
+)
+
+qt_add_resource(float16texture_with_compute "float16texture_with_compute"
+    PREFIX
+        "/"
+    FILES
+        ${float16texture_with_compute_resource_files}
+)
+
+
+#### Keys ignored in scope 1:.:.:float16texture_with_compute.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/rhi/floattexture/CMakeLists.txt b/tests/manual/rhi/floattexture/CMakeLists.txt
index 3368812524..241387eb4b 100644
--- a/tests/manual/rhi/floattexture/CMakeLists.txt
+++ b/tests/manual/rhi/floattexture/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## floattexture Binary:
 #####################################################################
 
-add_qt_manual_test(floattexture
+qt_add_manual_test(floattexture
     GUI
     SOURCES
         floattexture.cpp
@@ -29,7 +29,7 @@ set(floattexture_resource_files
     "../shared/texture.vert.qsb"
 )
 
-add_qt_resource(floattexture "floattexture"
+qt_add_resource(floattexture "floattexture"
     PREFIX
         "/"
     FILES
diff --git a/tests/manual/rhi/hellominimalcrossgfxtriangle/CMakeLists.txt b/tests/manual/rhi/hellominimalcrossgfxtriangle/CMakeLists.txt
index 8b9d3389f8..c995f56de2 100644
--- a/tests/manual/rhi/hellominimalcrossgfxtriangle/CMakeLists.txt
+++ b/tests/manual/rhi/hellominimalcrossgfxtriangle/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## hellominimalcrossgfxtriangle Binary:
 #####################################################################
 
-add_qt_manual_test(hellominimalcrossgfxtriangle
+qt_add_manual_test(hellominimalcrossgfxtriangle
     SOURCES
         hellowindow.cpp hellowindow.h
         main.cpp
@@ -26,7 +26,7 @@ set(hellominimalcrossgfxtriangle_resource_files
     "../shared/color.vert.qsb"
 )
 
-add_qt_resource(hellominimalcrossgfxtriangle "hellominimalcrossgfxtriangle"
+qt_add_resource(hellominimalcrossgfxtriangle "hellominimalcrossgfxtriangle"
     PREFIX
         "/"
     FILES
diff --git a/tests/manual/rhi/instancing/CMakeLists.txt b/tests/manual/rhi/instancing/CMakeLists.txt
index 8c8d0c2a9a..6cc41c7a73 100644
--- a/tests/manual/rhi/instancing/CMakeLists.txt
+++ b/tests/manual/rhi/instancing/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## instancing Binary:
 #####################################################################
 
-add_qt_manual_test(instancing
+qt_add_manual_test(instancing
     GUI
     SOURCES
         instancing.cpp
@@ -19,7 +19,7 @@ set(instancing_resource_files
     "inst.vert.qsb"
 )
 
-add_qt_resource(instancing "instancing"
+qt_add_resource(instancing "instancing"
     PREFIX
         "/"
     FILES
diff --git a/tests/manual/rhi/mrt/CMakeLists.txt b/tests/manual/rhi/mrt/CMakeLists.txt
index db63ebe07d..0df83106d0 100644
--- a/tests/manual/rhi/mrt/CMakeLists.txt
+++ b/tests/manual/rhi/mrt/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## mrt Binary:
 #####################################################################
 
-add_qt_manual_test(mrt
+qt_add_manual_test(mrt
     GUI
     SOURCES
         mrt.cpp
@@ -27,7 +27,7 @@ set(mrt_resource_files
     "mrt.vert.qsb"
 )
 
-add_qt_resource(mrt "mrt"
+qt_add_resource(mrt "mrt"
     PREFIX
         "/"
     FILES
diff --git a/tests/manual/rhi/msaarenderbuffer/CMakeLists.txt b/tests/manual/rhi/msaarenderbuffer/CMakeLists.txt
index 26aa8798de..2b682d81f7 100644
--- a/tests/manual/rhi/msaarenderbuffer/CMakeLists.txt
+++ b/tests/manual/rhi/msaarenderbuffer/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## msaarenderbuffer Binary:
 #####################################################################
 
-add_qt_manual_test(msaarenderbuffer
+qt_add_manual_test(msaarenderbuffer
     GUI
     SOURCES
         msaarenderbuffer.cpp
@@ -33,7 +33,7 @@ set(msaarenderbuffer_resource_files
     "../shared/texture.vert.qsb"
 )
 
-add_qt_resource(msaarenderbuffer "msaarenderbuffer"
+qt_add_resource(msaarenderbuffer "msaarenderbuffer"
     PREFIX
         "/"
     FILES
diff --git a/tests/manual/rhi/msaatexture/CMakeLists.txt b/tests/manual/rhi/msaatexture/CMakeLists.txt
index 5a3c447db4..e2392e4c3d 100644
--- a/tests/manual/rhi/msaatexture/CMakeLists.txt
+++ b/tests/manual/rhi/msaatexture/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## msaatexture Binary:
 #####################################################################
 
-add_qt_manual_test(msaatexture
+qt_add_manual_test(msaatexture
     GUI
     SOURCES
         msaatexture.cpp
@@ -37,7 +37,7 @@ set(msaatexture_resource_files
     "../shared/texture_ms4.frag.qsb"
 )
 
-add_qt_resource(msaatexture "msaatexture"
+qt_add_resource(msaatexture "msaatexture"
     PREFIX
         "/"
     FILES
diff --git a/tests/manual/rhi/multiwindow/CMakeLists.txt b/tests/manual/rhi/multiwindow/CMakeLists.txt
index a3e63b9d06..eb6e739add 100644
--- a/tests/manual/rhi/multiwindow/CMakeLists.txt
+++ b/tests/manual/rhi/multiwindow/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## multiwindow Binary:
 #####################################################################
 
-add_qt_manual_test(multiwindow
+qt_add_manual_test(multiwindow
     GUI
     SOURCES
         multiwindow.cpp
@@ -26,7 +26,7 @@ set(multiwindow_resource_files
     "../shared/color.vert.qsb"
 )
 
-add_qt_resource(multiwindow "multiwindow"
+qt_add_resource(multiwindow "multiwindow"
     PREFIX
         "/"
     FILES
diff --git a/tests/manual/rhi/multiwindow_threaded/CMakeLists.txt b/tests/manual/rhi/multiwindow_threaded/CMakeLists.txt
index f3f220dba6..2aad008e74 100644
--- a/tests/manual/rhi/multiwindow_threaded/CMakeLists.txt
+++ b/tests/manual/rhi/multiwindow_threaded/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## multiwindow_threaded Binary:
 #####################################################################
 
-add_qt_manual_test(multiwindow_threaded
+qt_add_manual_test(multiwindow_threaded
     GUI
     SOURCES
         multiwindow_threaded.cpp
@@ -31,7 +31,7 @@ set(multiwindow_threaded_resource_files
     "../shared/texture.vert.qsb"
 )
 
-add_qt_resource(multiwindow_threaded "multiwindow_threaded"
+qt_add_resource(multiwindow_threaded "multiwindow_threaded"
     PREFIX
         "/"
     FILES
diff --git a/tests/manual/rhi/offscreen/CMakeLists.txt b/tests/manual/rhi/offscreen/CMakeLists.txt
index 56a9f2661d..ffda2b17b4 100644
--- a/tests/manual/rhi/offscreen/CMakeLists.txt
+++ b/tests/manual/rhi/offscreen/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## offscreen Binary:
 #####################################################################
 
-add_qt_manual_test(offscreen
+qt_add_manual_test(offscreen
     SOURCES
         offscreen.cpp
     PUBLIC_LIBRARIES
@@ -24,7 +24,7 @@ set(offscreen_resource_files
     "../shared/color.vert.qsb"
 )
 
-add_qt_resource(offscreen "offscreen"
+qt_add_resource(offscreen "offscreen"
     PREFIX
         "/"
     FILES
diff --git a/tests/manual/rhi/qrhiprof/CMakeLists.txt b/tests/manual/rhi/qrhiprof/CMakeLists.txt
index 8f4fb3797b..a10161afaf 100644
--- a/tests/manual/rhi/qrhiprof/CMakeLists.txt
+++ b/tests/manual/rhi/qrhiprof/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qrhiprof Binary:
 #####################################################################
 
-add_qt_manual_test(qrhiprof
+qt_add_manual_test(qrhiprof
     GUI
     SOURCES
         qrhiprof.cpp
diff --git a/tests/manual/rhi/shadowmap/CMakeLists.txt b/tests/manual/rhi/shadowmap/CMakeLists.txt
index d2de92d094..23e24c1762 100644
--- a/tests/manual/rhi/shadowmap/CMakeLists.txt
+++ b/tests/manual/rhi/shadowmap/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## shadowmap Binary:
 #####################################################################
 
-add_qt_manual_test(shadowmap
+qt_add_manual_test(shadowmap
     GUI
     SOURCES
         shadowmap.cpp
@@ -21,7 +21,7 @@ set(shadowmap_resource_files
     "shadowmap.vert.qsb"
 )
 
-add_qt_resource(shadowmap "shadowmap"
+qt_add_resource(shadowmap "shadowmap"
     PREFIX
         "/"
     FILES
diff --git a/tests/manual/rhi/texuploads/CMakeLists.txt b/tests/manual/rhi/texuploads/CMakeLists.txt
index 2e97336a9d..20078d4067 100644
--- a/tests/manual/rhi/texuploads/CMakeLists.txt
+++ b/tests/manual/rhi/texuploads/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## texuploads Binary:
 #####################################################################
 
-add_qt_manual_test(texuploads
+qt_add_manual_test(texuploads
     GUI
     SOURCES
         texuploads.cpp
@@ -29,7 +29,7 @@ set(texuploads_resource_files
     "../shared/texture.vert.qsb"
 )
 
-add_qt_resource(texuploads "texuploads"
+qt_add_resource(texuploads "texuploads"
     PREFIX
         "/"
     FILES
diff --git a/tests/manual/rhi/triquadcube/CMakeLists.txt b/tests/manual/rhi/triquadcube/CMakeLists.txt
index 42ebf1f55f..c4fd5a0498 100644
--- a/tests/manual/rhi/triquadcube/CMakeLists.txt
+++ b/tests/manual/rhi/triquadcube/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## triquadcube Binary:
 #####################################################################
 
-add_qt_manual_test(triquadcube
+qt_add_manual_test(triquadcube
     GUI
     SOURCES
         quadrenderer.cpp quadrenderer.h
@@ -41,7 +41,7 @@ set(triquadcube_resource_files
     "../shared/texture.vert.qsb"
 )
 
-add_qt_resource(triquadcube "triquadcube"
+qt_add_resource(triquadcube "triquadcube"
     PREFIX
         "/"
     FILES
-- 
cgit v1.2.3