diff options
Diffstat (limited to 'examples/vulkan')
5 files changed, 21 insertions, 9 deletions
diff --git a/examples/vulkan/hellovulkancubes/CMakeLists.txt b/examples/vulkan/hellovulkancubes/CMakeLists.txt index f8999f3986..3321cb08e5 100644 --- a/examples/vulkan/hellovulkancubes/CMakeLists.txt +++ b/examples/vulkan/hellovulkancubes/CMakeLists.txt @@ -8,7 +8,7 @@ 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}/vulkan/hellovulkancubes") @@ -24,10 +24,12 @@ qt_add_executable(hellovulkancubes shader.cpp shader.h vulkanwindow.cpp vulkanwindow.h ) + set_target_properties(hellovulkancubes PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(hellovulkancubes PUBLIC Qt::Concurrent Qt::Core @@ -35,14 +37,15 @@ target_link_libraries(hellovulkancubes PUBLIC Qt::Widgets ) - # Resources: set_source_files_properties("../shared/block.buf" PROPERTIES QT_RESOURCE_ALIAS "block.buf" ) + set_source_files_properties("../shared/qt_logo.buf" PROPERTIES QT_RESOURCE_ALIAS "qt_logo.buf" ) + set(hellovulkancubes_resource_files "../shared/block.buf" "../shared/qt_logo.buf" diff --git a/examples/vulkan/hellovulkantexture/CMakeLists.txt b/examples/vulkan/hellovulkantexture/CMakeLists.txt index 421a82a540..181f92f85d 100644 --- a/examples/vulkan/hellovulkantexture/CMakeLists.txt +++ b/examples/vulkan/hellovulkantexture/CMakeLists.txt @@ -8,7 +8,7 @@ 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}/vulkan/hellovulkantexture") @@ -19,16 +19,17 @@ qt_add_executable(hellovulkantexture hellovulkantexture.cpp hellovulkantexture.h main.cpp ) + set_target_properties(hellovulkantexture PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(hellovulkantexture PUBLIC Qt::Core Qt::Gui ) - # Resources: set(hellovulkantexture_resource_files "qt256.png" diff --git a/examples/vulkan/hellovulkantriangle/CMakeLists.txt b/examples/vulkan/hellovulkantriangle/CMakeLists.txt index 5ca87cd893..01f2891d34 100644 --- a/examples/vulkan/hellovulkantriangle/CMakeLists.txt +++ b/examples/vulkan/hellovulkantriangle/CMakeLists.txt @@ -8,7 +8,7 @@ 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}/vulkan/hellovulkantriangle") @@ -19,23 +19,26 @@ qt_add_executable(hellovulkantriangle ../shared/trianglerenderer.cpp ../shared/trianglerenderer.h main.cpp ) + set_target_properties(hellovulkantriangle PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(hellovulkantriangle PUBLIC Qt::Core Qt::Gui ) - # Resources: set_source_files_properties("../shared/color_frag.spv" PROPERTIES QT_RESOURCE_ALIAS "color_frag.spv" ) + set_source_files_properties("../shared/color_vert.spv" PROPERTIES QT_RESOURCE_ALIAS "color_vert.spv" ) + set(hellovulkantriangle_resource_files "../shared/color_frag.spv" "../shared/color_vert.spv" diff --git a/examples/vulkan/hellovulkanwidget/CMakeLists.txt b/examples/vulkan/hellovulkanwidget/CMakeLists.txt index e7adcc3ef1..cb5f836d0e 100644 --- a/examples/vulkan/hellovulkanwidget/CMakeLists.txt +++ b/examples/vulkan/hellovulkanwidget/CMakeLists.txt @@ -8,7 +8,7 @@ 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}/vulkan/hellovulkanwidget") @@ -20,24 +20,27 @@ qt_add_executable(hellovulkanwidget hellovulkanwidget.cpp hellovulkanwidget.h main.cpp ) + set_target_properties(hellovulkanwidget PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(hellovulkanwidget PUBLIC Qt::Core Qt::Gui Qt::Widgets ) - # Resources: set_source_files_properties("../shared/color_frag.spv" PROPERTIES QT_RESOURCE_ALIAS "color_frag.spv" ) + set_source_files_properties("../shared/color_vert.spv" PROPERTIES QT_RESOURCE_ALIAS "color_vert.spv" ) + set(hellovulkanwidget_resource_files "../shared/color_frag.spv" "../shared/color_vert.spv" diff --git a/examples/vulkan/hellovulkanwindow/CMakeLists.txt b/examples/vulkan/hellovulkanwindow/CMakeLists.txt index af98431a3a..aa4eea044b 100644 --- a/examples/vulkan/hellovulkanwindow/CMakeLists.txt +++ b/examples/vulkan/hellovulkanwindow/CMakeLists.txt @@ -8,7 +8,7 @@ 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}/vulkan/hellovulkanwindow") @@ -19,10 +19,12 @@ qt_add_executable(hellovulkanwindow hellovulkanwindow.cpp hellovulkanwindow.h main.cpp ) + set_target_properties(hellovulkanwindow PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(hellovulkanwindow PUBLIC Qt::Core Qt::Gui |