summaryrefslogtreecommitdiffstats
path: root/examples/qt3d/pbr-materials
diff options
context:
space:
mode:
authorKai Köhne <kai.koehne@qt.io>2022-01-21 16:14:58 +0100
committerKai Köhne <kai.koehne@qt.io>2022-02-15 17:31:17 +0100
commit97c866c75f5d60a79d799279f315d744fbcc2174 (patch)
tree300b69bdf0c496cd0feb95aa96d7e3bfc7482708 /examples/qt3d/pbr-materials
parent363d8dc60d7e08eb6a84ea47d08a1cb454c13db8 (diff)
Improve examples CMakeLists.txt
- Remove # generated from xyz.pro comment from pro2cmake - Remove "# special case" markers for pro2cmake - Remove automatic use of CMAKE_AUTORCC - Only opt into CMAKE_AUTOUIC if .ui files are involved - Remove explicit setting of CMAKE_INCLUDE_CURRENT_DIR - Combine multiple find_package(Qt6 ... calls) - use REQUIRED COMPONENTS - sort components alphabetically - Fix wrong indentations - Use (only) one empty line after multi-line commands Pick-to: 6.3 Change-Id: I42cb1788cd53082f71f6a67446dc94f502497dca Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'examples/qt3d/pbr-materials')
-rw-r--r--examples/qt3d/pbr-materials/CMakeLists.txt23
1 files changed, 6 insertions, 17 deletions
diff --git a/examples/qt3d/pbr-materials/CMakeLists.txt b/examples/qt3d/pbr-materials/CMakeLists.txt
index dfbd1c4fa..8f5ebb99d 100644
--- a/examples/qt3d/pbr-materials/CMakeLists.txt
+++ b/examples/qt3d/pbr-materials/CMakeLists.txt
@@ -1,37 +1,25 @@
-# Generated from pbr-materials.pro.
-
cmake_minimum_required(VERSION 3.16)
project(pbr-materials 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")
+ 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 Qml)
-find_package(Qt6 COMPONENTS Quick)
-find_package(Qt6 COMPONENTS 3DQuickExtras)
+find_package(Qt6 REQUIRED COMPONENTS 3DCore 3DInput 3DQuick 3DQuickExtras 3DRender Core Gui Qml Quick)
qt_add_executable(pbr-materials
main.cpp
)
+
set_target_properties(pbr-materials PROPERTIES
WIN32_EXECUTABLE TRUE
MACOSX_BUNDLE TRUE
)
+
target_link_libraries(pbr-materials PUBLIC
Qt::3DCore
Qt::3DInput
@@ -44,7 +32,6 @@ target_link_libraries(pbr-materials PUBLIC
Qt::Quick
)
-
# Resources:
set(materials_resource_files
"BasicCamera.qml"
@@ -59,6 +46,7 @@ qt6_add_resources(pbr-materials "materials"
FILES
${materials_resource_files}
)
+
set(cubemaps_resource_files
"../exampleresources/assets/cubemaps/default/default_irradiance.dds"
"../exampleresources/assets/cubemaps/default/default_specular.dds"
@@ -78,6 +66,7 @@ qt6_add_resources(pbr-materials "cubemaps"
FILES
${cubemaps_resource_files}
)
+
set(obj_resource_files
"../exampleresources/assets/obj/ball.obj"
"../exampleresources/assets/obj/material-sphere.obj"