From a09e4c1aa99116ac3dae0682679e99ddd49248c8 Mon Sep 17 00:00:00 2001
From: Alexandru Croitor <alexandru.croitor@qt.io>
Date: Mon, 24 Aug 2020 10:38:34 +0200
Subject: CMake: Rename example conflicting with qtquick3d

Fixes: QTBUG-86205
Change-Id: I38992501abb86a4328527283ad8924ec886ea8c8
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
---
 .../scenegraph/customgeometry/.prev_CMakeLists.txt | 56 ++++++++++++++++++++++
 .../quick/scenegraph/customgeometry/CMakeLists.txt | 14 +++---
 2 files changed, 63 insertions(+), 7 deletions(-)
 create mode 100644 examples/quick/scenegraph/customgeometry/.prev_CMakeLists.txt

(limited to 'examples')

diff --git a/examples/quick/scenegraph/customgeometry/.prev_CMakeLists.txt b/examples/quick/scenegraph/customgeometry/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..6e4395503c
--- /dev/null
+++ b/examples/quick/scenegraph/customgeometry/.prev_CMakeLists.txt
@@ -0,0 +1,56 @@
+# Generated from customgeometry.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(customgeometry 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}/quick/scenegraph/customgeometry")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Quick)
+
+add_qt_gui_executable(customgeometry
+    beziercurve.cpp beziercurve.h
+    main.cpp
+)
+target_link_libraries(customgeometry PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Quick
+)
+
+
+# Resources:
+set(customgeometry_resource_files
+    "main.qml"
+)
+
+qt6_add_resources(customgeometry "customgeometry"
+    PREFIX
+        "/scenegraph/customgeometry"
+    FILES
+        ${customgeometry_resource_files}
+)
+
+install(TARGETS customgeometry
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
+
+set_target_properties(customgeometry PROPERTIES
+    QT_QML_MODULE_VERSION 1.0
+    QT_QML_MODULE_URI CustomGeometry
+)
+
+qt6_qml_type_registration(customgeometry)
diff --git a/examples/quick/scenegraph/customgeometry/CMakeLists.txt b/examples/quick/scenegraph/customgeometry/CMakeLists.txt
index 6e4395503c..0f62794a9f 100644
--- a/examples/quick/scenegraph/customgeometry/CMakeLists.txt
+++ b/examples/quick/scenegraph/customgeometry/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Generated from customgeometry.pro.
 
 cmake_minimum_required(VERSION 3.14)
-project(customgeometry LANGUAGES CXX)
+project(customgeometry_declarative LANGUAGES CXX) # special case
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
@@ -19,11 +19,11 @@ find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Quick)
 
-add_qt_gui_executable(customgeometry
+add_qt_gui_executable(customgeometry_declarative # special case
     beziercurve.cpp beziercurve.h
     main.cpp
 )
-target_link_libraries(customgeometry PUBLIC
+target_link_libraries(customgeometry_declarative PUBLIC # special case
     Qt::Core
     Qt::Gui
     Qt::Quick
@@ -35,22 +35,22 @@ set(customgeometry_resource_files
     "main.qml"
 )
 
-qt6_add_resources(customgeometry "customgeometry"
+qt6_add_resources(customgeometry_declarative "customgeometry" # special case
     PREFIX
         "/scenegraph/customgeometry"
     FILES
         ${customgeometry_resource_files}
 )
 
-install(TARGETS customgeometry
+install(TARGETS customgeometry_declarative # special case
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
     LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
 
-set_target_properties(customgeometry PROPERTIES
+set_target_properties(customgeometry_declarative PROPERTIES # special case
     QT_QML_MODULE_VERSION 1.0
     QT_QML_MODULE_URI CustomGeometry
 )
 
-qt6_qml_type_registration(customgeometry)
+qt6_qml_type_registration(customgeometry_declarative) # special case
-- 
cgit v1.2.3