diff options
author | Kai Köhne <[email protected]> | 2022-02-14 19:06:12 +0100 |
---|---|---|
committer | Kai Köhne <[email protected]> | 2022-02-21 10:24:37 +0100 |
commit | 8316c111ae7b45050c256a5d2336a1cfd7c7493d (patch) | |
tree | 3e7a8576f92412406eb1ef8606f23fc266b33c4b | |
parent | 64c9f1d6158aaa487d0fe2fbeaed5dc40fb4410d (diff) |
Improve examples CMakeLists.txt
- Remove "# generated from xyz.pro" comment from 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: I8590d4bf781a8258cb9f3b11029a4d6c1a336dc0
Reviewed-by: Jörg Bornemann <[email protected]>
31 files changed, 116 insertions, 325 deletions
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 49192862..efdedaaa 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from examples.pro. - qt_examples_build_begin(EXTERNAL_BUILD) add_subdirectory(quick3d) diff --git a/examples/quick3d/CMakeLists.txt b/examples/quick3d/CMakeLists.txt index 549fd244..cdcc9040 100644 --- a/examples/quick3d/CMakeLists.txt +++ b/examples/quick3d/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from quick3d.pro. - qt_internal_add_example(antialiasing) qt_internal_add_example(customshaders) qt_internal_add_example(effects) diff --git a/examples/quick3d/antialiasing/CMakeLists.txt b/examples/quick3d/antialiasing/CMakeLists.txt index 8aa3b17b..2c50d4a4 100644 --- a/examples/quick3d/antialiasing/CMakeLists.txt +++ b/examples/quick3d/antialiasing/CMakeLists.txt @@ -1,32 +1,25 @@ -# Generated from antialiasing.pro. - cmake_minimum_required(VERSION 3.16) project(antialiasing 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}/quick3d/antialiasing") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Quick) -find_package(Qt6 COMPONENTS Quick3D) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Quick Quick3D) qt_add_executable(antialiasing main.cpp ) + set_target_properties(antialiasing PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(antialiasing PUBLIC Qt::Core Qt::Gui diff --git a/examples/quick3d/customeffect/CMakeLists.txt b/examples/quick3d/customeffect/CMakeLists.txt index 5ea043e0..1ec23c06 100644 --- a/examples/quick3d/customeffect/CMakeLists.txt +++ b/examples/quick3d/customeffect/CMakeLists.txt @@ -1,32 +1,25 @@ -# Generated from customeffect.pro. - cmake_minimum_required(VERSION 3.16) project(customeffect 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}/quick3d/customeffect") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Quick) -find_package(Qt6 COMPONENTS Quick3D) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Quick Quick3D) qt_add_executable(customeffect main.cpp ) + set_target_properties(customeffect PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(customeffect PUBLIC Qt::Core Qt::Gui diff --git a/examples/quick3d/customgeometry/CMakeLists.txt b/examples/quick3d/customgeometry/CMakeLists.txt index bde6be3b..8e389acd 100644 --- a/examples/quick3d/customgeometry/CMakeLists.txt +++ b/examples/quick3d/customgeometry/CMakeLists.txt @@ -1,33 +1,26 @@ -# Generated from customgeometry.pro. - cmake_minimum_required(VERSION 3.16) 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") + set(INSTALL_EXAMPLESDIR "examples") endif() set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick3d/customgeometry") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Quick) -find_package(Qt6 COMPONENTS Quick3D) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Quick Quick3D) qt_add_executable(customgeometry examplegeometry.cpp examplegeometry.h main.cpp ) + set_target_properties(customgeometry PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(customgeometry PUBLIC Qt::Core Qt::Gui diff --git a/examples/quick3d/custominstancing/CMakeLists.txt b/examples/quick3d/custominstancing/CMakeLists.txt index 81024c11..526e3a39 100644 --- a/examples/quick3d/custominstancing/CMakeLists.txt +++ b/examples/quick3d/custominstancing/CMakeLists.txt @@ -1,33 +1,26 @@ -# Generated from custominstancing.pro. - cmake_minimum_required(VERSION 3.16) project(custominstancing 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}/quick3d/custominstancing") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Quick) -find_package(Qt6 COMPONENTS Quick3D) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Quick Quick3D) qt_add_executable(custominstancing cppinstancetable.cpp cppinstancetable.h main.cpp ) + set_target_properties(custominstancing PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(custominstancing PUBLIC Qt::Core Qt::Gui diff --git a/examples/quick3d/custommaterial/CMakeLists.txt b/examples/quick3d/custommaterial/CMakeLists.txt index 9fc0b869..d8f1f2b3 100644 --- a/examples/quick3d/custommaterial/CMakeLists.txt +++ b/examples/quick3d/custommaterial/CMakeLists.txt @@ -1,32 +1,25 @@ -# Generated from custommaterial.pro. - cmake_minimum_required(VERSION 3.16) project(custommaterial 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}/quick3d/custommaterial") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Quick) -find_package(Qt6 COMPONENTS Quick3D) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Quick Quick3D) qt_add_executable(custommaterial main.cpp ) + set_target_properties(custommaterial PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(custommaterial PUBLIC Qt::Core Qt::Gui diff --git a/examples/quick3d/custommorphing/CMakeLists.txt b/examples/quick3d/custommorphing/CMakeLists.txt index 2db4419d..c7319625 100644 --- a/examples/quick3d/custommorphing/CMakeLists.txt +++ b/examples/quick3d/custommorphing/CMakeLists.txt @@ -1,33 +1,26 @@ -# Generated from custommorphing.pro. - cmake_minimum_required(VERSION 3.16) project(custommorphing 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}/quick3d/custommorphing") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Quick) -find_package(Qt6 COMPONENTS Quick3D) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Quick Quick3D) qt_add_executable(custommorphing main.cpp morphgeometry.cpp morphgeometry.h ) + set_target_properties(custommorphing PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(custommorphing PUBLIC Qt::Core Qt::Gui diff --git a/examples/quick3d/customshaders/CMakeLists.txt b/examples/quick3d/customshaders/CMakeLists.txt index 9dff4860..02909561 100644 --- a/examples/quick3d/customshaders/CMakeLists.txt +++ b/examples/quick3d/customshaders/CMakeLists.txt @@ -1,32 +1,25 @@ -# Generated from customshaders.pro. - cmake_minimum_required(VERSION 3.16) project(customshaders 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}/quick3d/customshaders") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Quick) -find_package(Qt6 COMPONENTS Quick3D) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Quick Quick3D) qt_add_executable(customshaders main.cpp ) + set_target_properties(customshaders PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(customshaders PUBLIC Qt::Core Qt::Gui diff --git a/examples/quick3d/dynamiccreation/CMakeLists.txt b/examples/quick3d/dynamiccreation/CMakeLists.txt index 2d28eddc..98602601 100644 --- a/examples/quick3d/dynamiccreation/CMakeLists.txt +++ b/examples/quick3d/dynamiccreation/CMakeLists.txt @@ -1,32 +1,25 @@ -# Generated from dynamiccreation.pro. - cmake_minimum_required(VERSION 3.16) project(dynamiccreation 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}/quick3d/dynamiccreation") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Quick) -find_package(Qt6 COMPONENTS Quick3D) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Quick Quick3D) qt_add_executable(dynamiccreation main.cpp ) + set_target_properties(dynamiccreation PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(dynamiccreation PUBLIC Qt::Core Qt::Gui diff --git a/examples/quick3d/dynamictexture/CMakeLists.txt b/examples/quick3d/dynamictexture/CMakeLists.txt index aa7e5c96..c0847150 100644 --- a/examples/quick3d/dynamictexture/CMakeLists.txt +++ b/examples/quick3d/dynamictexture/CMakeLists.txt @@ -1,32 +1,25 @@ -# Generated from dynamictexture.pro. - cmake_minimum_required(VERSION 3.16) project(dynamictexture 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}/quick3d/dynamictexture") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Quick) -find_package(Qt6 COMPONENTS Quick3D) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Quick Quick3D) qt_add_executable(dynamictexture main.cpp ) + set_target_properties(dynamictexture PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(dynamictexture PUBLIC Qt::Core Qt::Gui diff --git a/examples/quick3d/effects/CMakeLists.txt b/examples/quick3d/effects/CMakeLists.txt index d4fc7de7..e66c1a3b 100644 --- a/examples/quick3d/effects/CMakeLists.txt +++ b/examples/quick3d/effects/CMakeLists.txt @@ -1,32 +1,25 @@ -# Generated from effects.pro. - cmake_minimum_required(VERSION 3.16) project(effects 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}/quick3d/effects") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Quick) -find_package(Qt6 COMPONENTS Quick3D) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Quick Quick3D) qt_add_executable(effects main.cpp ) + set_target_properties(effects PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(effects PUBLIC Qt::Core Qt::Gui diff --git a/examples/quick3d/hellocube/CMakeLists.txt b/examples/quick3d/hellocube/CMakeLists.txt index c0a2f834..279c0a7f 100644 --- a/examples/quick3d/hellocube/CMakeLists.txt +++ b/examples/quick3d/hellocube/CMakeLists.txt @@ -1,32 +1,25 @@ -# Generated from hellocube.pro. - cmake_minimum_required(VERSION 3.16) project(hellocube 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}/quick3d/hellocube") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Quick) -find_package(Qt6 COMPONENTS Quick3D) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Quick Quick3D) qt_add_executable(hellocube main.cpp ) + set_target_properties(hellocube PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(hellocube PUBLIC Qt::Core Qt::Gui diff --git a/examples/quick3d/helloqtquick3d/CMakeLists.txt b/examples/quick3d/helloqtquick3d/CMakeLists.txt index f6a49f8c..61632e8d 100644 --- a/examples/quick3d/helloqtquick3d/CMakeLists.txt +++ b/examples/quick3d/helloqtquick3d/CMakeLists.txt @@ -1,33 +1,26 @@ -# Generated from helloqtquick3d.pro. - cmake_minimum_required(VERSION 3.16) project(helloqtquick3d 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}/quick3d/helloqtquick3d") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Quick) -find_package(Qt6 COMPONENTS Quick3D) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Quick Quick3D) qt_add_executable(helloqtquick3d imageinstancetable.cpp imageinstancetable.h main.cpp ) + set_target_properties(helloqtquick3d PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(helloqtquick3d PUBLIC Qt::Core Qt::Gui @@ -46,7 +39,6 @@ qt_add_qml_module(helloqtquick3d NO_RESOURCE_TARGET_PATH ) - install(TARGETS helloqtquick3d RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/quick3d/instancing/CMakeLists.txt b/examples/quick3d/instancing/CMakeLists.txt index d949d6a2..54faf5a5 100644 --- a/examples/quick3d/instancing/CMakeLists.txt +++ b/examples/quick3d/instancing/CMakeLists.txt @@ -1,32 +1,25 @@ -# Generated from instancing.pro. - cmake_minimum_required(VERSION 3.16) project(instancing 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}/quick3d/instancing") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Quick) -find_package(Qt6 COMPONENTS Quick3D) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Quick Quick3D) qt_add_executable(instancing main.cpp ) + set_target_properties(instancing PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(instancing PUBLIC Qt::Core Qt::Gui diff --git a/examples/quick3d/intro/CMakeLists.txt b/examples/quick3d/intro/CMakeLists.txt index 81793d96..476fe9e0 100644 --- a/examples/quick3d/intro/CMakeLists.txt +++ b/examples/quick3d/intro/CMakeLists.txt @@ -1,32 +1,25 @@ -# Generated from intro.pro. - cmake_minimum_required(VERSION 3.16) project(intro 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}/quick3d/intro") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Quick) -find_package(Qt6 COMPONENTS Quick3D) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Quick Quick3D) qt_add_executable(intro main.cpp ) + set_target_properties(intro PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(intro PUBLIC Qt::Core Qt::Gui diff --git a/examples/quick3d/lights/CMakeLists.txt b/examples/quick3d/lights/CMakeLists.txt index 7fd67da9..dcc70ffe 100644 --- a/examples/quick3d/lights/CMakeLists.txt +++ b/examples/quick3d/lights/CMakeLists.txt @@ -1,32 +1,25 @@ -# Generated from lights.pro. - cmake_minimum_required(VERSION 3.16) project(lights 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}/quick3d/lights") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Quick) -find_package(Qt6 COMPONENTS Quick3D) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Quick Quick3D) qt_add_executable(lights main.cpp ) + set_target_properties(lights PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(lights PUBLIC Qt::Core Qt::Gui diff --git a/examples/quick3d/morphing/CMakeLists.txt b/examples/quick3d/morphing/CMakeLists.txt index 9fbb1b23..3988a0ef 100644 --- a/examples/quick3d/morphing/CMakeLists.txt +++ b/examples/quick3d/morphing/CMakeLists.txt @@ -1,32 +1,25 @@ -# Generated from morphing.pro. - cmake_minimum_required(VERSION 3.16) project(morphing 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}/quick3d/morphing") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Quick) -find_package(Qt6 COMPONENTS Quick3D) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Quick Quick3D) qt_add_executable(morphing main.cpp ) + set_target_properties(morphing PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(morphing PUBLIC Qt::Core Qt::Gui diff --git a/examples/quick3d/offlineshaders/CMakeLists.txt b/examples/quick3d/offlineshaders/CMakeLists.txt index 0f32e35d..a6434bb1 100644 --- a/examples/quick3d/offlineshaders/CMakeLists.txt +++ b/examples/quick3d/offlineshaders/CMakeLists.txt @@ -1,32 +1,25 @@ -# Generated from offlineshaders.pro. - cmake_minimum_required(VERSION 3.16) project(offlineshaders 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}/quick3d/offlineshaders") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Quick) -find_package(Qt6 COMPONENTS Quick3D) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Quick Quick3D) qt_add_executable(offlineshaders main.cpp ) + set_target_properties(offlineshaders PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(offlineshaders PUBLIC Qt::Core Qt::Gui diff --git a/examples/quick3d/particles3d/CMakeLists.txt b/examples/quick3d/particles3d/CMakeLists.txt index 93fc980b..3c683ea5 100644 --- a/examples/quick3d/particles3d/CMakeLists.txt +++ b/examples/quick3d/particles3d/CMakeLists.txt @@ -1,32 +1,25 @@ -# Generated from particles3d.pro. - cmake_minimum_required(VERSION 3.16) project(particles3d 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}/quick3d/particles3d") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Quick) -find_package(Qt6 COMPONENTS Quick3D) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Quick Quick3D) qt_add_executable(particles3d main.cpp ) + set_target_properties(particles3d PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(particles3d PUBLIC Qt::Core Qt::Gui diff --git a/examples/quick3d/picking/CMakeLists.txt b/examples/quick3d/picking/CMakeLists.txt index d10f91df..aeb47c83 100644 --- a/examples/quick3d/picking/CMakeLists.txt +++ b/examples/quick3d/picking/CMakeLists.txt @@ -1,32 +1,25 @@ -# Generated from picking.pro. - cmake_minimum_required(VERSION 3.16) project(picking 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}/quick3d/picking") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Quick) -find_package(Qt6 COMPONENTS Quick3D) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Quick Quick3D) qt_add_executable(picking main.cpp ) + set_target_properties(picking PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(picking PUBLIC Qt::Core Qt::Gui diff --git a/examples/quick3d/principledmaterial/CMakeLists.txt b/examples/quick3d/principledmaterial/CMakeLists.txt index 094ca5fc..7b0b8c10 100644 --- a/examples/quick3d/principledmaterial/CMakeLists.txt +++ b/examples/quick3d/principledmaterial/CMakeLists.txt @@ -1,33 +1,26 @@ -# Generated from principledmaterial.pro. - cmake_minimum_required(VERSION 3.16) project(principledmaterial 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}/quick3d/principledmaterial") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Quick) -find_package(Qt6 COMPONENTS Quick3D) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Quick Quick3D) qt_add_executable(principledmaterial main.cpp imagehelper.h imagehelper.cpp ) + set_target_properties(principledmaterial PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(principledmaterial PUBLIC Qt::Core Qt::Gui diff --git a/examples/quick3d/proceduraltexture/CMakeLists.txt b/examples/quick3d/proceduraltexture/CMakeLists.txt index 06d5e713..9c21398a 100644 --- a/examples/quick3d/proceduraltexture/CMakeLists.txt +++ b/examples/quick3d/proceduraltexture/CMakeLists.txt @@ -1,34 +1,26 @@ -# Generated from proceduraltexture.pro. - cmake_minimum_required(VERSION 3.16) project(proceduraltexture 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}/quick3d/proceduraltexture") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Qml) -find_package(Qt6 COMPONENTS Quick) -find_package(Qt6 COMPONENTS Quick3D) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick Quick3D) qt_add_executable(proceduraltexture gradienttexture.cpp gradienttexture.h main.cpp ) + set_target_properties(proceduraltexture PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(proceduraltexture PUBLIC Qt::Core Qt::Gui diff --git a/examples/quick3d/quickball/CMakeLists.txt b/examples/quick3d/quickball/CMakeLists.txt index ca3c4574..1165727e 100644 --- a/examples/quick3d/quickball/CMakeLists.txt +++ b/examples/quick3d/quickball/CMakeLists.txt @@ -1,32 +1,25 @@ -# Generated from quickball.pro. - cmake_minimum_required(VERSION 3.16) project(quickball 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}/quick3d/quickball") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Quick) -find_package(Qt6 COMPONENTS Quick3D) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Quick Quick3D) qt_add_executable(quickball main.cpp ) + set_target_properties(quickball PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(quickball PUBLIC Qt::Core Qt::Gui diff --git a/examples/quick3d/quickitems/CMakeLists.txt b/examples/quick3d/quickitems/CMakeLists.txt index 6b2e39c6..e86aa2d0 100644 --- a/examples/quick3d/quickitems/CMakeLists.txt +++ b/examples/quick3d/quickitems/CMakeLists.txt @@ -1,32 +1,25 @@ -# Generated from quickitems.pro. - cmake_minimum_required(VERSION 3.16) project(quickitems 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}/quick3d/quickitems") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Quick) -find_package(Qt6 COMPONENTS Quick3D) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Quick Quick3D) qt_add_executable(quickitems main.cpp ) + set_target_properties(quickitems PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(quickitems PUBLIC Qt::Core Qt::Gui diff --git a/examples/quick3d/reflectionprobes/CMakeLists.txt b/examples/quick3d/reflectionprobes/CMakeLists.txt index 45b0abb6..113e9e5c 100644 --- a/examples/quick3d/reflectionprobes/CMakeLists.txt +++ b/examples/quick3d/reflectionprobes/CMakeLists.txt @@ -1,32 +1,25 @@ -# Generated from reflectionprobes.pro. - cmake_minimum_required(VERSION 3.16) project(reflectionprobes 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}/quick3d/reflectionprobes") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Quick) -find_package(Qt6 COMPONENTS Quick3D) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Quick Quick3D) qt_add_executable(reflectionprobes main.cpp ) + set_target_properties(reflectionprobes PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(reflectionprobes PUBLIC Qt::Core Qt::Gui diff --git a/examples/quick3d/runtimeloader/CMakeLists.txt b/examples/quick3d/runtimeloader/CMakeLists.txt index 4f35cc6e..35560376 100644 --- a/examples/quick3d/runtimeloader/CMakeLists.txt +++ b/examples/quick3d/runtimeloader/CMakeLists.txt @@ -1,31 +1,25 @@ cmake_minimum_required(VERSION 3.16) project(runtimeloader 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}/quick3d/runtimeloader") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Quick) -find_package(Qt6 COMPONENTS Quick3D) -find_package(Qt6 COMPONENTS Widgets) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Quick Quick3D Widgets) qt_add_executable(runtimeloader main.cpp ) + set_target_properties(runtimeloader PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(runtimeloader PUBLIC Qt::Core Qt::Gui diff --git a/examples/quick3d/screenspacereflections/CMakeLists.txt b/examples/quick3d/screenspacereflections/CMakeLists.txt index c91f5e42..1e110ae5 100644 --- a/examples/quick3d/screenspacereflections/CMakeLists.txt +++ b/examples/quick3d/screenspacereflections/CMakeLists.txt @@ -1,32 +1,25 @@ -# Generated from screenspacereflections.pro. - cmake_minimum_required(VERSION 3.16) project(custommaterial 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}/quick3d/screenspacereflections") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Quick) -find_package(Qt6 COMPONENTS Quick3D) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Quick Quick3D) qt_add_executable(screenspacereflections main.cpp ) + set_target_properties(screenspacereflections PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(screenspacereflections PUBLIC Qt::Core Qt::Gui diff --git a/examples/quick3d/skinning/CMakeLists.txt b/examples/quick3d/skinning/CMakeLists.txt index d18bd18f..4f1672a7 100644 --- a/examples/quick3d/skinning/CMakeLists.txt +++ b/examples/quick3d/skinning/CMakeLists.txt @@ -1,34 +1,26 @@ -# Generated from skinning.pro. - cmake_minimum_required(VERSION 3.16) project(skinning 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}/quick3d/skinning") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Qml) -find_package(Qt6 COMPONENTS Quick) -find_package(Qt6 COMPONENTS Quick3D) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick Quick3D) qt_add_executable(skinning main.cpp skingeometry.cpp skingeometry.h ) + set_target_properties(skinning PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(skinning PUBLIC Qt::Core Qt::Gui diff --git a/examples/quick3d/submeshes/CMakeLists.txt b/examples/quick3d/submeshes/CMakeLists.txt index 2decdfd4..d0042ff3 100644 --- a/examples/quick3d/submeshes/CMakeLists.txt +++ b/examples/quick3d/submeshes/CMakeLists.txt @@ -1,32 +1,25 @@ -# Generated from submeshes.pro. - cmake_minimum_required(VERSION 3.16) project(submeshes 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}/quick3d/submeshes") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Quick) -find_package(Qt6 COMPONENTS Quick3D) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Quick Quick3D) qt_add_executable(submeshes main.cpp ) + set_target_properties(submeshes PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(submeshes PUBLIC Qt::Core Qt::Gui diff --git a/examples/quick3d/view3d/CMakeLists.txt b/examples/quick3d/view3d/CMakeLists.txt index 4dbdb4da..e9800015 100644 --- a/examples/quick3d/view3d/CMakeLists.txt +++ b/examples/quick3d/view3d/CMakeLists.txt @@ -1,32 +1,25 @@ -# Generated from view3d.pro. - cmake_minimum_required(VERSION 3.16) project(view3d 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}/quick3d/view3d") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Quick) -find_package(Qt6 COMPONENTS Quick3D) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Quick Quick3D) qt_add_executable(view3d main.cpp ) + set_target_properties(view3d PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(view3d PUBLIC Qt::Core Qt::Gui |