From 76108058796bf0884f6fd128d81f1bc49f9a56af Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 4 Feb 2020 08:15:50 +0100 Subject: Regenerate examples Change-Id: I04b2adbe370ffea81d7787ad90e4ae69d2c165cb Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann --- examples/vulkan/hellovulkancubes/CMakeLists.txt | 4 ++-- examples/vulkan/hellovulkantexture/CMakeLists.txt | 4 ++-- examples/vulkan/hellovulkantriangle/CMakeLists.txt | 4 ++-- examples/vulkan/hellovulkanwidget/CMakeLists.txt | 4 ++-- examples/vulkan/hellovulkanwindow/CMakeLists.txt | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) (limited to 'examples/vulkan') diff --git a/examples/vulkan/hellovulkancubes/CMakeLists.txt b/examples/vulkan/hellovulkancubes/CMakeLists.txt index c77cd59d8c..94feac6401 100644 --- a/examples/vulkan/hellovulkancubes/CMakeLists.txt +++ b/examples/vulkan/hellovulkancubes/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/vulkan/hellovulkancubes") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -32,6 +32,7 @@ target_link_libraries(hellovulkancubes PUBLIC Qt::Widgets ) + # Resources: set_source_files_properties("../shared/block.buf" PROPERTIES QT_RESOURCE_ALIAS "block.buf" @@ -55,7 +56,6 @@ qt6_add_resources(hellovulkancubes "hellovulkancubes" ${hellovulkancubes_resource_files} ) - install(TARGETS hellovulkancubes RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/vulkan/hellovulkantexture/CMakeLists.txt b/examples/vulkan/hellovulkantexture/CMakeLists.txt index b9cbd179f0..59e019998c 100644 --- a/examples/vulkan/hellovulkantexture/CMakeLists.txt +++ b/examples/vulkan/hellovulkantexture/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/vulkan/hellovulkantexture") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -23,6 +23,7 @@ target_link_libraries(hellovulkantexture PUBLIC Qt::Gui ) + # Resources: set(hellovulkantexture_resource_files "qt256.png" @@ -37,7 +38,6 @@ qt6_add_resources(hellovulkantexture "hellovulkantexture" ${hellovulkantexture_resource_files} ) - install(TARGETS hellovulkantexture RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/vulkan/hellovulkantriangle/CMakeLists.txt b/examples/vulkan/hellovulkantriangle/CMakeLists.txt index 73ca042881..dae891ea07 100644 --- a/examples/vulkan/hellovulkantriangle/CMakeLists.txt +++ b/examples/vulkan/hellovulkantriangle/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/vulkan/hellovulkantriangle") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -23,6 +23,7 @@ target_link_libraries(hellovulkantriangle PUBLIC Qt::Gui ) + # Resources: set_source_files_properties("../shared/color_frag.spv" PROPERTIES QT_RESOURCE_ALIAS "color_frag.spv" @@ -42,7 +43,6 @@ qt6_add_resources(hellovulkantriangle "hellovulkantriangle" ${hellovulkantriangle_resource_files} ) - install(TARGETS hellovulkantriangle RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/vulkan/hellovulkanwidget/CMakeLists.txt b/examples/vulkan/hellovulkanwidget/CMakeLists.txt index 281c49e77d..6dde273e94 100644 --- a/examples/vulkan/hellovulkanwidget/CMakeLists.txt +++ b/examples/vulkan/hellovulkanwidget/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/vulkan/hellovulkanwidget") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -26,6 +26,7 @@ target_link_libraries(hellovulkanwidget PUBLIC Qt::Widgets ) + # Resources: set_source_files_properties("../shared/color_frag.spv" PROPERTIES QT_RESOURCE_ALIAS "color_frag.spv" @@ -45,7 +46,6 @@ qt6_add_resources(hellovulkanwidget "hellovulkanwidget" ${hellovulkanwidget_resource_files} ) - install(TARGETS hellovulkanwidget RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/vulkan/hellovulkanwindow/CMakeLists.txt b/examples/vulkan/hellovulkanwindow/CMakeLists.txt index 6e79b959a8..3a20345899 100644 --- a/examples/vulkan/hellovulkanwindow/CMakeLists.txt +++ b/examples/vulkan/hellovulkanwindow/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/vulkan/hellovulkanwindow") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) -- cgit v1.2.3