From c4be23758f05719584f2bc4c676fda81c57a9d63 Mon Sep 17 00:00:00 2001
From: Alexandru Croitor <alexandru.croitor@qt.io>
Date: Fri, 16 Oct 2020 16:10:16 +0200
Subject: CMake: Regenerate qt3d examples

Many of the examples were missing find_package() calls.
Some were missing some example install dir things.
Some missing special cases.
Some incorrectly specified library names due to missing mappings in
pro2cmake.
Some incorrectly specified target names.

Change-Id: I131a02dc679502ea6c1cdeb32962e77f09e672af
Reviewed-by: Mike Krus <mike.krus@kdab.com>
---
 examples/qt3d/simple-qml/.prev_CMakeLists.txt | 62 +++++++++++++++++++++++++++
 examples/qt3d/simple-qml/CMakeLists.txt       | 10 ++++-
 2 files changed, 71 insertions(+), 1 deletion(-)
 create mode 100644 examples/qt3d/simple-qml/.prev_CMakeLists.txt

(limited to 'examples/qt3d/simple-qml')

diff --git a/examples/qt3d/simple-qml/.prev_CMakeLists.txt b/examples/qt3d/simple-qml/.prev_CMakeLists.txt
new file mode 100644
index 000000000..03aeeac0e
--- /dev/null
+++ b/examples/qt3d/simple-qml/.prev_CMakeLists.txt
@@ -0,0 +1,62 @@
+# Generated from simple-qml.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(simple-qml 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")
+endif()
+
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS 3DCore)
+find_package(Qt6 COMPONENTS 3DRender)
+find_package(Qt6 COMPONENTS 3DInput)
+find_package(Qt6 COMPONENTS 3DQuick)
+find_package(Qt6 COMPONENTS 3DLogic)
+find_package(Qt6 COMPONENTS Qml)
+find_package(Qt6 COMPONENTS Quick)
+find_package(Qt6 COMPONENTS 3DQuickExtras)
+
+add_qt_gui_executable(simple-qml
+    main.cpp
+)
+target_link_libraries(simple-qml PUBLIC
+    Qt::3DCore
+    Qt::3DInput
+    Qt::3DLogic
+    Qt::3DQuick
+    Qt::3DQuickExtras
+    Qt::3DRender
+    Qt::Core
+    Qt::Gui
+    Qt::Qml
+    Qt::Quick
+)
+
+
+# Resources:
+set(simple-qml_resource_files
+    "main.qml"
+)
+
+qt6_add_resources(simple-qml "simple-qml"
+    PREFIX
+        "/"
+    FILES
+        ${simple-qml_resource_files}
+)
+
+install(TARGETS simple-qml
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/qt3d/simple-qml/CMakeLists.txt b/examples/qt3d/simple-qml/CMakeLists.txt
index cd9bf9fd6..ec8c63114 100644
--- a/examples/qt3d/simple-qml/CMakeLists.txt
+++ b/examples/qt3d/simple-qml/CMakeLists.txt
@@ -17,8 +17,14 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS 3DCore)
+find_package(Qt6 COMPONENTS 3DRender)
+find_package(Qt6 COMPONENTS 3DInput)
+find_package(Qt6 COMPONENTS 3DQuick)
+find_package(Qt6 COMPONENTS 3DLogic)
 find_package(Qt6 COMPONENTS Qml)
 find_package(Qt6 COMPONENTS Quick)
+find_package(Qt6 COMPONENTS 3DQuickExtras)
 
 add_qt_gui_executable(simple-qml
     main.cpp
@@ -26,7 +32,7 @@ add_qt_gui_executable(simple-qml
 target_link_libraries(simple-qml PUBLIC
     Qt::3DCore
     Qt::3DInput
-    3DLogic
+    Qt::3DLogic
     Qt::3DQuick
     Qt::3DQuickExtras
     Qt::3DRender
@@ -49,7 +55,9 @@ qt6_add_resources(simple-qml "simple-qml"
         ${simple-qml_resource_files}
 )
 
+# special case begin
 target_sources(simple-qml PRIVATE ${simple-qml_resource_files})
+# special case end
 
 install(TARGETS simple-qml
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
-- 
cgit v1.2.3