From 30917cd20ce1e40482e967fdafb5f8b95a62b640 Mon Sep 17 00:00:00 2001
From: Alexandru Croitor <alexandru.croitor@qt.io>
Date: Mon, 14 Oct 2019 18:33:07 +0200
Subject: Regenerate required projects after dev -> wip/cmake merge

Change-Id: Ic5f1909731ec11b4fb6bc8823506d272c529ecfb
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
---
 examples/quick/scenegraph/.prev_CMakeLists.txt     | 24 ++++++++++++++++++++++
 examples/quick/scenegraph/CMakeLists.txt           |  6 +++++-
 examples/quick/scenegraph/fboitem/CMakeLists.txt   | 22 ++++++++++----------
 .../quick/scenegraph/rendernode/CMakeLists.txt     | 12 -----------
 4 files changed, 40 insertions(+), 24 deletions(-)
 create mode 100644 examples/quick/scenegraph/.prev_CMakeLists.txt

(limited to 'examples')

diff --git a/examples/quick/scenegraph/.prev_CMakeLists.txt b/examples/quick/scenegraph/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..f4e416390a
--- /dev/null
+++ b/examples/quick/scenegraph/.prev_CMakeLists.txt
@@ -0,0 +1,24 @@
+# Generated from scenegraph.pro.
+
+add_subdirectory(customgeometry)
+add_subdirectory(rendernode)
+add_subdirectory(threadedanimation)
+if(QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FEATURE_opengles3)
+    add_subdirectory(graph)
+    add_subdirectory(simplematerial)
+    add_subdirectory(sgengine)
+    add_subdirectory(fboitem)
+    add_subdirectory(openglunderqml)
+    add_subdirectory(textureinthread)
+    add_subdirectory(twotextureproviders)
+endif()
+if(APPLE_OSX)
+    add_subdirectory(metalunderqml)
+    add_subdirectory(metaltextureimport)
+endif()
+if(WIN32)
+    add_subdirectory(d3d11underqml)
+endif()
+if(QT_FEATURE_vulkan)
+    add_subdirectory(vulkanunderqml)
+endif()
diff --git a/examples/quick/scenegraph/CMakeLists.txt b/examples/quick/scenegraph/CMakeLists.txt
index c18f77b937..32f5152235 100644
--- a/examples/quick/scenegraph/CMakeLists.txt
+++ b/examples/quick/scenegraph/CMakeLists.txt
@@ -7,14 +7,18 @@ if(QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FEATURE_opengles3)
     add_subdirectory(graph)
     add_subdirectory(simplematerial)
     add_subdirectory(sgengine)
-    add_subdirectory(textureinsgnode)
+    add_subdirectory(fboitem)
     add_subdirectory(openglunderqml)
     add_subdirectory(textureinthread)
     add_subdirectory(twotextureproviders)
 endif()
 if(APPLE_OSX)
     add_subdirectory(metalunderqml)
+    # add_subdirectory(metaltextureimport) special case TODO
 endif()
 if(WIN32)
     add_subdirectory(d3d11underqml)
 endif()
+if(QT_FEATURE_vulkan)
+    add_subdirectory(vulkanunderqml)
+endif()
diff --git a/examples/quick/scenegraph/fboitem/CMakeLists.txt b/examples/quick/scenegraph/fboitem/CMakeLists.txt
index 1117ef22a9..e788fe5468 100644
--- a/examples/quick/scenegraph/fboitem/CMakeLists.txt
+++ b/examples/quick/scenegraph/fboitem/CMakeLists.txt
@@ -1,7 +1,7 @@
-# Generated from textureinsgnode.pro.
+# Generated from fboitem.pro.
 
 cmake_minimum_required(VERSION 3.14)
-project(textureinsgnode LANGUAGES CXX)
+project(fboitem LANGUAGES CXX)
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
@@ -9,23 +9,23 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples/quick/scenegraph/textureinsgnode")
+set(INSTALL_EXAMPLEDIR "examples/quick/scenegraph/fboitem")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Qml)
 find_package(Qt6 COMPONENTS Quick)
 
-add_qt_gui_executable(textureinsgnode
+add_qt_gui_executable(fboitem
     ../shared/logorenderer.cpp ../shared/logorenderer.h
     fboinsgrenderer.cpp fboinsgrenderer.h
     main.cpp
 )
-target_include_directories(textureinsgnode PUBLIC
+target_include_directories(fboitem PUBLIC
     ../shared
 )
 
-target_link_libraries(textureinsgnode PUBLIC
+target_link_libraries(fboitem PUBLIC
     Qt::Core
     Qt::Gui
     Qt::Qml
@@ -34,18 +34,18 @@ target_link_libraries(textureinsgnode PUBLIC
 
 
 # Resources:
-set(textureinsgnode_resource_files
+set(fboitem_resource_files
     "main.qml"
 )
 
-qt6_add_resources(textureinsgnode "textureinsgnode"
+qt6_add_resources(fboitem "fboitem"
     PREFIX
-        "/scenegraph/textureinsgnode"
+        "/scenegraph/fboitem"
     FILES
-        ${textureinsgnode_resource_files}
+        ${fboitem_resource_files}
 )
 
-install(TARGETS textureinsgnode
+install(TARGETS fboitem
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
     LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/quick/scenegraph/rendernode/CMakeLists.txt b/examples/quick/scenegraph/rendernode/CMakeLists.txt
index 05ed4dab42..51de91a37e 100644
--- a/examples/quick/scenegraph/rendernode/CMakeLists.txt
+++ b/examples/quick/scenegraph/rendernode/CMakeLists.txt
@@ -56,17 +56,6 @@ if(QT_FEATURE_d3d12)
     )
 endif()
 
-if(QT_FEATURE_d3d12)
-    target_sources(rendernode PUBLIC
-        d3d12renderer.cpp d3d12renderer.h
-    )
-
-    target_link_libraries(rendernode PUBLIC
-        d3d12
-    )
-
-endif()
-
 if(APPLE_OSX)
     target_sources(rendernode PUBLIC
         metalrenderer.h metalrenderer.mm
@@ -76,7 +65,6 @@ if(APPLE_OSX)
         "-framework AppKit"
         "-framework Metal"
     )
-
 endif()
 
 install(TARGETS rendernode
-- 
cgit v1.2.3