From 841e4ee8fe160e2bc2a2ed31fc8ecb746d6356be Mon Sep 17 00:00:00 2001 From: Tobias Frisch <tfrisch@uni-koblenz.de> Date: Thu, 9 Jun 2022 14:49:10 +0200 Subject: [PATCH] Added Vulkan includes to all modules Signed-off-by: Tobias Frisch <tfrisch@uni-koblenz.de> --- modules/asset_loader/CMakeLists.txt | 2 +- modules/camera/CMakeLists.txt | 2 +- modules/effects/CMakeLists.txt | 2 +- modules/upscaling/CMakeLists.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/asset_loader/CMakeLists.txt b/modules/asset_loader/CMakeLists.txt index 0ef40da7..03e18887 100644 --- a/modules/asset_loader/CMakeLists.txt +++ b/modules/asset_loader/CMakeLists.txt @@ -34,7 +34,7 @@ include(config/STB.cmake) target_link_libraries(vkcv_asset_loader ${vkcv_asset_loader_libraries} vkcv ${vkcv_libraries}) # including headers of dependencies and the VkCV framework -target_include_directories(vkcv_asset_loader SYSTEM BEFORE PRIVATE ${vkcv_asset_loader_includes} ${vkcv_includes}) +target_include_directories(vkcv_asset_loader SYSTEM BEFORE PRIVATE ${vkcv_asset_loader_includes} ${vkcv_include} ${vkcv_includes}) # add the own include directory for public headers target_include_directories(vkcv_asset_loader BEFORE PUBLIC ${vkcv_asset_loader_include}) diff --git a/modules/camera/CMakeLists.txt b/modules/camera/CMakeLists.txt index b76e2fd1..cfc34146 100644 --- a/modules/camera/CMakeLists.txt +++ b/modules/camera/CMakeLists.txt @@ -31,7 +31,7 @@ include(config/GLM.cmake) target_link_libraries(vkcv_camera PUBLIC ${vkcv_camera_libraries} vkcv) -target_include_directories(vkcv_camera SYSTEM BEFORE PRIVATE ${vkcv_camera_includes} ${vkcv_include}) +target_include_directories(vkcv_camera SYSTEM BEFORE PRIVATE ${vkcv_camera_includes} ${vkcv_include} ${vkcv_includes}) # add the own include directory for public headers target_include_directories(vkcv_camera BEFORE PUBLIC ${vkcv_camera_include} ${vkcv_camera_includes}) diff --git a/modules/effects/CMakeLists.txt b/modules/effects/CMakeLists.txt index 8de9ea53..ea350fd4 100644 --- a/modules/effects/CMakeLists.txt +++ b/modules/effects/CMakeLists.txt @@ -40,7 +40,7 @@ add_library(vkcv_effects ${vkcv_build_attribute} ${vkcv_effects_sources}) target_link_libraries(vkcv_effects ${vkcv_effects_libraries} vkcv vkcv_shader_compiler vkcv_camera vkcv_asset_loader) # including headers of dependencies and the VkCV framework -target_include_directories(vkcv_effects SYSTEM BEFORE PRIVATE ${vkcv_effects_includes} ${vkcv_include} ${vkcv_shader_compiler_include} ${vkcv_camera_include} {vkcv_asset_loader_include}) +target_include_directories(vkcv_effects SYSTEM BEFORE PRIVATE ${vkcv_effects_includes} ${vkcv_include} ${vkcv_includes} ${vkcv_shader_compiler_include} ${vkcv_camera_include} {vkcv_asset_loader_include}) # add the own include directory for public headers target_include_directories(vkcv_effects BEFORE PUBLIC ${vkcv_effects_include}) diff --git a/modules/upscaling/CMakeLists.txt b/modules/upscaling/CMakeLists.txt index 6d6e7b98..47a963d4 100644 --- a/modules/upscaling/CMakeLists.txt +++ b/modules/upscaling/CMakeLists.txt @@ -39,7 +39,7 @@ add_library(vkcv_upscaling ${vkcv_build_attribute} ${vkcv_upscaling_sources}) target_link_libraries(vkcv_upscaling ${vkcv_upscaling_libraries} vkcv vkcv_shader_compiler) # including headers of dependencies and the VkCV framework -target_include_directories(vkcv_upscaling SYSTEM BEFORE PRIVATE ${vkcv_upscaling_includes} ${vkcv_include} ${vkcv_shader_compiler_include}) +target_include_directories(vkcv_upscaling SYSTEM BEFORE PRIVATE ${vkcv_upscaling_includes} ${vkcv_include} ${vkcv_includes} ${vkcv_shader_compiler_include}) # add the own include directory for public headers target_include_directories(vkcv_upscaling BEFORE PUBLIC ${vkcv_upscaling_include}) -- GitLab