From b7b7285d0198c6d7e0e2f1a10a90a386e04f9e90 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Tue, 18 May 2021 15:11:15 +0200 Subject: Re-generate CMake project files for examples Pick-to: 6.1 Change-Id: Ic123a704f904096e112b5bdece167800dfc295bb Reviewed-by: Alexandru Croitor --- examples/qt3d/3d-text/CMakeLists.txt | 4 ++++ examples/qt3d/advancedcustommaterial/.prev_CMakeLists.txt | 6 ++++++ examples/qt3d/advancedcustommaterial/CMakeLists.txt | 4 ++++ examples/qt3d/anaglyph-rendering/CMakeLists.txt | 4 ++++ examples/qt3d/audio-visualizer-qml/CMakeLists.txt | 4 ++++ examples/qt3d/basicshapes-cpp/CMakeLists.txt | 4 ++++ examples/qt3d/compute-particles/CMakeLists.txt | 4 ++++ examples/qt3d/controls/.prev_CMakeLists.txt | 4 ++++ examples/qt3d/controls/CMakeLists.txt | 4 ++++ examples/qt3d/controlsunderlay/CMakeLists.txt | 4 ++++ examples/qt3d/instanced-arrays-qml/CMakeLists.txt | 4 ++++ examples/qt3d/lights/CMakeLists.txt | 4 ++++ examples/qt3d/multiviewport/CMakeLists.txt | 4 ++++ examples/qt3d/pbr-materials/CMakeLists.txt | 4 ++++ examples/qt3d/phong-cubes/CMakeLists.txt | 4 ++++ examples/qt3d/planets-qml/CMakeLists.txt | 4 ++++ examples/qt3d/qardboard/CMakeLists.txt | 4 ++++ examples/qt3d/qgltf/CMakeLists.txt | 4 ++++ examples/qt3d/scene2d/.prev_CMakeLists.txt | 4 ++++ examples/qt3d/scene2d/CMakeLists.txt | 4 ++++ examples/qt3d/scene3d/.prev_CMakeLists.txt | 4 ++++ examples/qt3d/scene3d/CMakeLists.txt | 4 ++++ examples/qt3d/shadow-map-qml/CMakeLists.txt | 4 ++++ examples/qt3d/simple-cpp/CMakeLists.txt | 4 ++++ examples/qt3d/simple-qml/.prev_CMakeLists.txt | 4 ++++ examples/qt3d/simple-qml/CMakeLists.txt | 4 ++++ examples/qt3d/simplecustommaterial/CMakeLists.txt | 4 ++++ examples/qt3d/wave/.prev_CMakeLists.txt | 4 ++++ examples/qt3d/wave/CMakeLists.txt | 4 ++++ examples/qt3d/widgets-scene3d/CMakeLists.txt | 4 ++++ examples/qt3d/wireframe/CMakeLists.txt | 4 ++++ 31 files changed, 126 insertions(+) (limited to 'examples/qt3d') diff --git a/examples/qt3d/3d-text/CMakeLists.txt b/examples/qt3d/3d-text/CMakeLists.txt index 50f5c8df8..24021f14c 100644 --- a/examples/qt3d/3d-text/CMakeLists.txt +++ b/examples/qt3d/3d-text/CMakeLists.txt @@ -25,6 +25,10 @@ find_package(Qt6 COMPONENTS 3DExtras) qt_add_executable(3d-text main.cpp ) +set_target_properties(3d-text PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(3d-text PUBLIC Qt::3DCore Qt::3DExtras diff --git a/examples/qt3d/advancedcustommaterial/.prev_CMakeLists.txt b/examples/qt3d/advancedcustommaterial/.prev_CMakeLists.txt index 04bc8f46a..b4afe14f5 100644 --- a/examples/qt3d/advancedcustommaterial/.prev_CMakeLists.txt +++ b/examples/qt3d/advancedcustommaterial/.prev_CMakeLists.txt @@ -23,6 +23,10 @@ find_package(Qt6 COMPONENTS Quick) qt_add_executable(advancedcustommaterial main.cpp ) +set_target_properties(advancedcustommaterial PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(advancedcustommaterial PUBLIC Qt::Core Qt::Gui @@ -75,6 +79,8 @@ set(shaders_resource_files "shaders/es2/water.vert" "shaders/gl3/water.frag" "shaders/gl3/water.vert" + "shaders/rhi/water.frag" + "shaders/rhi/water.vert" ) qt6_add_resources(advancedcustommaterial "shaders" diff --git a/examples/qt3d/advancedcustommaterial/CMakeLists.txt b/examples/qt3d/advancedcustommaterial/CMakeLists.txt index 848991f2d..b06ec23a9 100644 --- a/examples/qt3d/advancedcustommaterial/CMakeLists.txt +++ b/examples/qt3d/advancedcustommaterial/CMakeLists.txt @@ -23,6 +23,10 @@ find_package(Qt6 COMPONENTS Quick) qt_add_executable(advancedcustommaterial main.cpp ) +set_target_properties(advancedcustommaterial PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(advancedcustommaterial PUBLIC Qt::Core Qt::Gui diff --git a/examples/qt3d/anaglyph-rendering/CMakeLists.txt b/examples/qt3d/anaglyph-rendering/CMakeLists.txt index 7020fe2bf..809f2b97f 100644 --- a/examples/qt3d/anaglyph-rendering/CMakeLists.txt +++ b/examples/qt3d/anaglyph-rendering/CMakeLists.txt @@ -29,6 +29,10 @@ find_package(Qt6 COMPONENTS 3DQuickExtras) qt_add_executable(anaglyph-rendering main.cpp ) +set_target_properties(anaglyph-rendering PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(anaglyph-rendering PUBLIC Qt::3DCore Qt::3DExtras diff --git a/examples/qt3d/audio-visualizer-qml/CMakeLists.txt b/examples/qt3d/audio-visualizer-qml/CMakeLists.txt index b81e1a8ad..bd975369d 100644 --- a/examples/qt3d/audio-visualizer-qml/CMakeLists.txt +++ b/examples/qt3d/audio-visualizer-qml/CMakeLists.txt @@ -27,6 +27,10 @@ qt_add_executable(audio-visualizer-qml main.cpp touchsettings.cpp touchsettings.h ) +set_target_properties(audio-visualizer-qml PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(audio-visualizer-qml PUBLIC Qt::3DCore Qt::3DQuick diff --git a/examples/qt3d/basicshapes-cpp/CMakeLists.txt b/examples/qt3d/basicshapes-cpp/CMakeLists.txt index e380497e1..8ad9c60bd 100644 --- a/examples/qt3d/basicshapes-cpp/CMakeLists.txt +++ b/examples/qt3d/basicshapes-cpp/CMakeLists.txt @@ -27,6 +27,10 @@ qt_add_executable(basicshapes-cpp main.cpp scenemodifier.cpp scenemodifier.h ) +set_target_properties(basicshapes-cpp PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(basicshapes-cpp PUBLIC Qt::3DCore Qt::3DExtras diff --git a/examples/qt3d/compute-particles/CMakeLists.txt b/examples/qt3d/compute-particles/CMakeLists.txt index c221b3a25..de63ae82b 100644 --- a/examples/qt3d/compute-particles/CMakeLists.txt +++ b/examples/qt3d/compute-particles/CMakeLists.txt @@ -27,6 +27,10 @@ find_package(Qt6 COMPONENTS Qml) qt_add_executable(compute-particles main.cpp ) +set_target_properties(compute-particles PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(compute-particles PUBLIC Qt::3DCore Qt::3DInput diff --git a/examples/qt3d/controls/.prev_CMakeLists.txt b/examples/qt3d/controls/.prev_CMakeLists.txt index fa7051776..21aa6e604 100644 --- a/examples/qt3d/controls/.prev_CMakeLists.txt +++ b/examples/qt3d/controls/.prev_CMakeLists.txt @@ -23,6 +23,10 @@ find_package(Qt6 COMPONENTS Quick) qt_add_executable(controls main.cpp ) +set_target_properties(controls PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(controls PUBLIC Qt::Core Qt::Gui diff --git a/examples/qt3d/controls/CMakeLists.txt b/examples/qt3d/controls/CMakeLists.txt index d4c67a986..07550ab21 100644 --- a/examples/qt3d/controls/CMakeLists.txt +++ b/examples/qt3d/controls/CMakeLists.txt @@ -23,6 +23,10 @@ find_package(Qt6 COMPONENTS Quick) qt_add_executable(controls main.cpp ) +set_target_properties(controls PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(controls PUBLIC Qt::Core Qt::Gui diff --git a/examples/qt3d/controlsunderlay/CMakeLists.txt b/examples/qt3d/controlsunderlay/CMakeLists.txt index fb5622375..1b65bc755 100644 --- a/examples/qt3d/controlsunderlay/CMakeLists.txt +++ b/examples/qt3d/controlsunderlay/CMakeLists.txt @@ -23,6 +23,10 @@ find_package(Qt6 COMPONENTS Quick) qt_add_executable(controlsunderlay main.cpp ) +set_target_properties(controlsunderlay PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(controlsunderlay PUBLIC Qt::Core Qt::Gui diff --git a/examples/qt3d/instanced-arrays-qml/CMakeLists.txt b/examples/qt3d/instanced-arrays-qml/CMakeLists.txt index 531b84fe2..ddaae8b73 100644 --- a/examples/qt3d/instanced-arrays-qml/CMakeLists.txt +++ b/examples/qt3d/instanced-arrays-qml/CMakeLists.txt @@ -29,6 +29,10 @@ qt_add_executable(instanced-arrays-qml instancebuffer.cpp instancebuffer.h main.cpp ) +set_target_properties(instanced-arrays-qml PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(instanced-arrays-qml PUBLIC Qt::3DCore Qt::3DInput diff --git a/examples/qt3d/lights/CMakeLists.txt b/examples/qt3d/lights/CMakeLists.txt index 5c3fce2ed..fba9f3cd1 100644 --- a/examples/qt3d/lights/CMakeLists.txt +++ b/examples/qt3d/lights/CMakeLists.txt @@ -28,6 +28,10 @@ find_package(Qt6 COMPONENTS 3DQuickExtras) qt_add_executable(lights main.cpp ) +set_target_properties(lights PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(lights PUBLIC Qt::3DCore Qt::3DInput diff --git a/examples/qt3d/multiviewport/CMakeLists.txt b/examples/qt3d/multiviewport/CMakeLists.txt index df6b788c6..753f4e413 100644 --- a/examples/qt3d/multiviewport/CMakeLists.txt +++ b/examples/qt3d/multiviewport/CMakeLists.txt @@ -28,6 +28,10 @@ find_package(Qt6 COMPONENTS 3DQuickExtras) qt_add_executable(multiviewport main.cpp ) +set_target_properties(multiviewport PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(multiviewport PUBLIC Qt::3DCore Qt::3DInput diff --git a/examples/qt3d/pbr-materials/CMakeLists.txt b/examples/qt3d/pbr-materials/CMakeLists.txt index 4178908ff..76c5d8e45 100644 --- a/examples/qt3d/pbr-materials/CMakeLists.txt +++ b/examples/qt3d/pbr-materials/CMakeLists.txt @@ -28,6 +28,10 @@ find_package(Qt6 COMPONENTS 3DQuickExtras) 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 diff --git a/examples/qt3d/phong-cubes/CMakeLists.txt b/examples/qt3d/phong-cubes/CMakeLists.txt index e1af140fc..acae88f81 100644 --- a/examples/qt3d/phong-cubes/CMakeLists.txt +++ b/examples/qt3d/phong-cubes/CMakeLists.txt @@ -28,6 +28,10 @@ find_package(Qt6 COMPONENTS 3DQuickExtras) qt_add_executable(phong-cubes main.cpp ) +set_target_properties(phong-cubes PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(phong-cubes PUBLIC Qt::3DCore Qt::3DInput diff --git a/examples/qt3d/planets-qml/CMakeLists.txt b/examples/qt3d/planets-qml/CMakeLists.txt index 750a85096..a0530aa1a 100644 --- a/examples/qt3d/planets-qml/CMakeLists.txt +++ b/examples/qt3d/planets-qml/CMakeLists.txt @@ -33,6 +33,10 @@ qt_add_executable(planets-qml main.cpp networkcontroller.cpp networkcontroller.h ) +set_target_properties(planets-qml PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(planets-qml PUBLIC Qt::3DCore Qt::3DInput diff --git a/examples/qt3d/qardboard/CMakeLists.txt b/examples/qt3d/qardboard/CMakeLists.txt index 929e9f6fd..9374ca584 100644 --- a/examples/qt3d/qardboard/CMakeLists.txt +++ b/examples/qt3d/qardboard/CMakeLists.txt @@ -31,6 +31,10 @@ qt_add_executable(qardboard dummydeviceorientation.cpp dummydeviceorientation.h main.cpp ) +set_target_properties(qardboard PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(qardboard PUBLIC Qt::3DCore Qt::3DExtras diff --git a/examples/qt3d/qgltf/CMakeLists.txt b/examples/qt3d/qgltf/CMakeLists.txt index 8eb5a2ac0..0ea1ed167 100644 --- a/examples/qt3d/qgltf/CMakeLists.txt +++ b/examples/qt3d/qgltf/CMakeLists.txt @@ -28,6 +28,10 @@ find_package(Qt6 COMPONENTS Quick) qt_add_executable(qgltf main.cpp ) +set_target_properties(qgltf PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(qgltf PUBLIC Qt::3DCore Qt::3DInput diff --git a/examples/qt3d/scene2d/.prev_CMakeLists.txt b/examples/qt3d/scene2d/.prev_CMakeLists.txt index ac9d0c5b7..d76ae1356 100644 --- a/examples/qt3d/scene2d/.prev_CMakeLists.txt +++ b/examples/qt3d/scene2d/.prev_CMakeLists.txt @@ -25,6 +25,10 @@ find_package(Qt6 COMPONENTS 3DQuickExtras) qt_add_executable(scene2d main.cpp ) +set_target_properties(scene2d PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(scene2d PUBLIC Qt::3DQuick Qt::3DQuickExtras diff --git a/examples/qt3d/scene2d/CMakeLists.txt b/examples/qt3d/scene2d/CMakeLists.txt index 5fae98613..28c12c159 100644 --- a/examples/qt3d/scene2d/CMakeLists.txt +++ b/examples/qt3d/scene2d/CMakeLists.txt @@ -25,6 +25,10 @@ find_package(Qt6 COMPONENTS 3DQuickExtras) qt_add_executable(scene2dsample # special case main.cpp ) +set_target_properties(scene2dsample PROPERTIES # special case + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(scene2dsample PUBLIC # special case Qt::3DQuick Qt::3DQuickExtras diff --git a/examples/qt3d/scene3d/.prev_CMakeLists.txt b/examples/qt3d/scene3d/.prev_CMakeLists.txt index f9041d342..dab80e57f 100644 --- a/examples/qt3d/scene3d/.prev_CMakeLists.txt +++ b/examples/qt3d/scene3d/.prev_CMakeLists.txt @@ -24,6 +24,10 @@ find_package(Qt6 COMPONENTS 3DInput) qt_add_executable(scene3d main.cpp ) +set_target_properties(scene3d PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(scene3d PUBLIC Qt::3DInput Qt::Core diff --git a/examples/qt3d/scene3d/CMakeLists.txt b/examples/qt3d/scene3d/CMakeLists.txt index ceef21738..baefd34d5 100644 --- a/examples/qt3d/scene3d/CMakeLists.txt +++ b/examples/qt3d/scene3d/CMakeLists.txt @@ -24,6 +24,10 @@ find_package(Qt6 COMPONENTS 3DInput) qt_add_executable(scene3d main.cpp ) +set_target_properties(scene3d PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(scene3d PUBLIC Qt::3DInput Qt::Core diff --git a/examples/qt3d/shadow-map-qml/CMakeLists.txt b/examples/qt3d/shadow-map-qml/CMakeLists.txt index 20d0b83d7..7ad090091 100644 --- a/examples/qt3d/shadow-map-qml/CMakeLists.txt +++ b/examples/qt3d/shadow-map-qml/CMakeLists.txt @@ -28,6 +28,10 @@ find_package(Qt6 COMPONENTS 3DQuickExtras) qt_add_executable(shadow-map-qml main.cpp ) +set_target_properties(shadow-map-qml PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(shadow-map-qml PUBLIC Qt::3DCore Qt::3DInput diff --git a/examples/qt3d/simple-cpp/CMakeLists.txt b/examples/qt3d/simple-cpp/CMakeLists.txt index 356857661..78060ce01 100644 --- a/examples/qt3d/simple-cpp/CMakeLists.txt +++ b/examples/qt3d/simple-cpp/CMakeLists.txt @@ -26,6 +26,10 @@ qt_add_executable(simple-cpp main.cpp orbittransformcontroller.cpp orbittransformcontroller.h ) +set_target_properties(simple-cpp PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(simple-cpp PUBLIC Qt::3DCore Qt::3DExtras diff --git a/examples/qt3d/simple-qml/.prev_CMakeLists.txt b/examples/qt3d/simple-qml/.prev_CMakeLists.txt index 8faa23b92..bf9829c31 100644 --- a/examples/qt3d/simple-qml/.prev_CMakeLists.txt +++ b/examples/qt3d/simple-qml/.prev_CMakeLists.txt @@ -29,6 +29,10 @@ find_package(Qt6 COMPONENTS 3DQuickExtras) qt_add_executable(simple-qml main.cpp ) +set_target_properties(simple-qml PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(simple-qml PUBLIC Qt::3DCore Qt::3DInput diff --git a/examples/qt3d/simple-qml/CMakeLists.txt b/examples/qt3d/simple-qml/CMakeLists.txt index 6049365c3..675b14396 100644 --- a/examples/qt3d/simple-qml/CMakeLists.txt +++ b/examples/qt3d/simple-qml/CMakeLists.txt @@ -29,6 +29,10 @@ find_package(Qt6 COMPONENTS 3DQuickExtras) qt_add_executable(simple-qml main.cpp ) +set_target_properties(simple-qml PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(simple-qml PUBLIC Qt::3DCore Qt::3DInput diff --git a/examples/qt3d/simplecustommaterial/CMakeLists.txt b/examples/qt3d/simplecustommaterial/CMakeLists.txt index ef54f734f..0cf3c886f 100644 --- a/examples/qt3d/simplecustommaterial/CMakeLists.txt +++ b/examples/qt3d/simplecustommaterial/CMakeLists.txt @@ -23,6 +23,10 @@ find_package(Qt6 COMPONENTS Quick) qt_add_executable(simplecustommaterial main.cpp ) +set_target_properties(simplecustommaterial PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(simplecustommaterial PUBLIC Qt::Core Qt::Gui diff --git a/examples/qt3d/wave/.prev_CMakeLists.txt b/examples/qt3d/wave/.prev_CMakeLists.txt index f7a053ac8..b5759b5e0 100644 --- a/examples/qt3d/wave/.prev_CMakeLists.txt +++ b/examples/qt3d/wave/.prev_CMakeLists.txt @@ -28,6 +28,10 @@ find_package(Qt6 COMPONENTS 3DQuickExtras) qt_add_executable(wave main.cpp ) +set_target_properties(wave PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(wave PUBLIC Qt::3DCore Qt::3DInput diff --git a/examples/qt3d/wave/CMakeLists.txt b/examples/qt3d/wave/CMakeLists.txt index 8cd278840..4632cabfa 100644 --- a/examples/qt3d/wave/CMakeLists.txt +++ b/examples/qt3d/wave/CMakeLists.txt @@ -28,6 +28,10 @@ find_package(Qt6 COMPONENTS 3DQuickExtras) qt_add_executable(wave main.cpp ) +set_target_properties(wave PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(wave PUBLIC Qt::3DCore Qt::3DInput diff --git a/examples/qt3d/widgets-scene3d/CMakeLists.txt b/examples/qt3d/widgets-scene3d/CMakeLists.txt index a03a26eb1..1e32ec6e9 100644 --- a/examples/qt3d/widgets-scene3d/CMakeLists.txt +++ b/examples/qt3d/widgets-scene3d/CMakeLists.txt @@ -26,6 +26,10 @@ find_package(Qt6 COMPONENTS 3DInput) qt_add_executable(widgets-scene3d main.cpp ) +set_target_properties(widgets-scene3d PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(widgets-scene3d PUBLIC Qt::3DInput Qt::Core diff --git a/examples/qt3d/wireframe/CMakeLists.txt b/examples/qt3d/wireframe/CMakeLists.txt index 2510e61ba..304757bf9 100644 --- a/examples/qt3d/wireframe/CMakeLists.txt +++ b/examples/qt3d/wireframe/CMakeLists.txt @@ -28,6 +28,10 @@ find_package(Qt6 COMPONENTS 3DQuickExtras) qt_add_executable(wireframe main.cpp ) +set_target_properties(wireframe PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(wireframe PUBLIC Qt::3DCore Qt::3DInput -- cgit v1.2.3