summaryrefslogtreecommitdiffstats
path: root/examples/qt3d/advancedcustommaterial
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2020-10-16 16:10:16 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2020-10-16 16:49:27 +0200
commitc4be23758f05719584f2bc4c676fda81c57a9d63 (patch)
treef9f17dbc41663639fffbf163633fb263126fa6ee /examples/qt3d/advancedcustommaterial
parent26ec84b4b123991ae4351d974fcbc753ee1d833e (diff)
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>
Diffstat (limited to 'examples/qt3d/advancedcustommaterial')
-rw-r--r--examples/qt3d/advancedcustommaterial/.prev_CMakeLists.txt91
-rw-r--r--examples/qt3d/advancedcustommaterial/CMakeLists.txt2
2 files changed, 93 insertions, 0 deletions
diff --git a/examples/qt3d/advancedcustommaterial/.prev_CMakeLists.txt b/examples/qt3d/advancedcustommaterial/.prev_CMakeLists.txt
new file mode 100644
index 000000000..a6b928532
--- /dev/null
+++ b/examples/qt3d/advancedcustommaterial/.prev_CMakeLists.txt
@@ -0,0 +1,91 @@
+# Generated from advancedcustommaterial.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(advancedcustommaterial 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 Qml)
+find_package(Qt6 COMPONENTS Quick)
+
+add_qt_gui_executable(advancedcustommaterial
+ main.cpp
+)
+target_link_libraries(advancedcustommaterial PUBLIC
+ Qt::Core
+ Qt::Gui
+ Qt::Qml
+ Qt::Quick
+)
+
+
+# Resources:
+set(qml_resource_files
+ "SceneRoot.qml"
+ "Water.qml"
+ "WaterMaterial.qml"
+ "main.qml"
+)
+
+qt6_add_resources(advancedcustommaterial "qml"
+ PREFIX
+ "/"
+ FILES
+ ${qml_resource_files}
+)
+set(models_resource_files
+ "models/waterPlane.obj"
+)
+
+qt6_add_resources(advancedcustommaterial "models"
+ PREFIX
+ "/"
+ FILES
+ ${models_resource_files}
+)
+set(textures_resource_files
+ "textures/WaterDiffuse.jpg"
+ "textures/WaterNormal.jpg"
+ "textures/WaterSpecular.jpg"
+ "textures/Waterwave.jpg"
+ "textures/foam.jpg"
+ "textures/sky.jpg"
+)
+
+qt6_add_resources(advancedcustommaterial "textures"
+ PREFIX
+ "/"
+ FILES
+ ${textures_resource_files}
+)
+set(shaders_resource_files
+ "shaders/es2/water.frag"
+ "shaders/es2/water.vert"
+ "shaders/gl3/water.frag"
+ "shaders/gl3/water.vert"
+)
+
+qt6_add_resources(advancedcustommaterial "shaders"
+ PREFIX
+ "/"
+ FILES
+ ${shaders_resource_files}
+)
+
+install(TARGETS advancedcustommaterial
+ RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+ BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+ LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/qt3d/advancedcustommaterial/CMakeLists.txt b/examples/qt3d/advancedcustommaterial/CMakeLists.txt
index 5a1eecd36..3a281889c 100644
--- a/examples/qt3d/advancedcustommaterial/CMakeLists.txt
+++ b/examples/qt3d/advancedcustommaterial/CMakeLists.txt
@@ -45,7 +45,9 @@ qt6_add_resources(advancedcustommaterial "qml"
FILES
${qml_resource_files}
)
+# special case begin
target_sources(advancedcustommaterial PRIVATE ${qml_resource_files}) # just to show qml files in creator
+# special case end
set(models_resource_files
"models/waterPlane.obj"