diff --git a/samples/01_InitInstance/CMakeLists.txt b/samples/01_InitInstance/CMakeLists.txt index 96b6c4b..d623e5c 100644 --- a/samples/01_InitInstance/CMakeLists.txt +++ b/samples/01_InitInstance/CMakeLists.txt @@ -32,4 +32,4 @@ add_executable(01_InitInstance ) set_target_properties(01_InitInstance PROPERTIES FOLDER "Samples") -target_link_libraries(01_InitInstance "$ENV{VULKAN_SDK}/Lib/vulkan-1.lib") +target_link_libraries(01_InitInstance "${Vulkan_LIBRARIES}") diff --git a/samples/02_EnumerateDevices/CMakeLists.txt b/samples/02_EnumerateDevices/CMakeLists.txt index 87edabf..6cad21e 100644 --- a/samples/02_EnumerateDevices/CMakeLists.txt +++ b/samples/02_EnumerateDevices/CMakeLists.txt @@ -34,4 +34,4 @@ add_executable(02_EnumerateDevices ) set_target_properties(02_EnumerateDevices PROPERTIES FOLDER "Samples") -target_link_libraries(02_EnumerateDevices "$ENV{VULKAN_SDK}/Lib/vulkan-1.lib") +target_link_libraries(02_EnumerateDevices "${Vulkan_LIBRARIES}") diff --git a/samples/03_InitDevice/CMakeLists.txt b/samples/03_InitDevice/CMakeLists.txt index db1e880..944e093 100644 --- a/samples/03_InitDevice/CMakeLists.txt +++ b/samples/03_InitDevice/CMakeLists.txt @@ -34,4 +34,4 @@ add_executable(03_InitDevice ) set_target_properties(03_InitDevice PROPERTIES FOLDER "Samples") -target_link_libraries(03_InitDevice "$ENV{VULKAN_SDK}/Lib/vulkan-1.lib") +target_link_libraries(03_InitDevice "${Vulkan_LIBRARIES}") diff --git a/samples/04_InitCommandBuffer/CMakeLists.txt b/samples/04_InitCommandBuffer/CMakeLists.txt index a6e1895..150af6d 100644 --- a/samples/04_InitCommandBuffer/CMakeLists.txt +++ b/samples/04_InitCommandBuffer/CMakeLists.txt @@ -34,4 +34,4 @@ add_executable(04_InitCommandBuffer ) set_target_properties(04_InitCommandBuffer PROPERTIES FOLDER "Samples") -target_link_libraries(04_InitCommandBuffer "$ENV{VULKAN_SDK}/Lib/vulkan-1.lib") +target_link_libraries(04_InitCommandBuffer "${Vulkan_LIBRARIES}") diff --git a/samples/05_InitSwapchain/CMakeLists.txt b/samples/05_InitSwapchain/CMakeLists.txt index 0356011..74aaffb 100644 --- a/samples/05_InitSwapchain/CMakeLists.txt +++ b/samples/05_InitSwapchain/CMakeLists.txt @@ -34,4 +34,4 @@ add_executable(05_InitSwapchain ) set_target_properties(05_InitSwapchain PROPERTIES FOLDER "Samples") -target_link_libraries(05_InitSwapchain "$ENV{VULKAN_SDK}/Lib/vulkan-1.lib") +target_link_libraries(05_InitSwapchain "${Vulkan_LIBRARIES}") diff --git a/samples/06_InitDepthBuffer/CMakeLists.txt b/samples/06_InitDepthBuffer/CMakeLists.txt index 7111c13..bf13043 100644 --- a/samples/06_InitDepthBuffer/CMakeLists.txt +++ b/samples/06_InitDepthBuffer/CMakeLists.txt @@ -34,4 +34,4 @@ add_executable(06_InitDepthBuffer ) set_target_properties(06_InitDepthBuffer PROPERTIES FOLDER "Samples") -target_link_libraries(06_InitDepthBuffer "$ENV{VULKAN_SDK}/Lib/vulkan-1.lib") +target_link_libraries(06_InitDepthBuffer "${Vulkan_LIBRARIES}") diff --git a/samples/07_InitUniformBuffer/CMakeLists.txt b/samples/07_InitUniformBuffer/CMakeLists.txt index 3c13b37..8810c0e 100644 --- a/samples/07_InitUniformBuffer/CMakeLists.txt +++ b/samples/07_InitUniformBuffer/CMakeLists.txt @@ -34,4 +34,4 @@ add_executable(07_InitUniformBuffer ) set_target_properties(07_InitUniformBuffer PROPERTIES FOLDER "Samples") -target_link_libraries(07_InitUniformBuffer "$ENV{VULKAN_SDK}/Lib/vulkan-1.lib") +target_link_libraries(07_InitUniformBuffer "${Vulkan_LIBRARIES}") diff --git a/samples/08_InitPipelineLayout/CMakeLists.txt b/samples/08_InitPipelineLayout/CMakeLists.txt index 91c9690..2c60a48 100644 --- a/samples/08_InitPipelineLayout/CMakeLists.txt +++ b/samples/08_InitPipelineLayout/CMakeLists.txt @@ -34,4 +34,4 @@ add_executable(08_InitPipelineLayout ) set_target_properties(08_InitPipelineLayout PROPERTIES FOLDER "Samples") -target_link_libraries(08_InitPipelineLayout "$ENV{VULKAN_SDK}/Lib/vulkan-1.lib") +target_link_libraries(08_InitPipelineLayout "${Vulkan_LIBRARIES}") diff --git a/samples/09_InitDescriptorSet/CMakeLists.txt b/samples/09_InitDescriptorSet/CMakeLists.txt index b73ff37..8f6e836 100644 --- a/samples/09_InitDescriptorSet/CMakeLists.txt +++ b/samples/09_InitDescriptorSet/CMakeLists.txt @@ -36,4 +36,4 @@ add_executable(09_InitDescriptorSet ) set_target_properties(09_InitDescriptorSet PROPERTIES FOLDER "Samples") -target_link_libraries(09_InitDescriptorSet "$ENV{VULKAN_SDK}/Lib/vulkan-1.lib") +target_link_libraries(09_InitDescriptorSet "${Vulkan_LIBRARIES}") diff --git a/samples/10_InitRenderPass/CMakeLists.txt b/samples/10_InitRenderPass/CMakeLists.txt index 97ddf87..74e5f12 100644 --- a/samples/10_InitRenderPass/CMakeLists.txt +++ b/samples/10_InitRenderPass/CMakeLists.txt @@ -34,4 +34,4 @@ add_executable(10_InitRenderPass ) set_target_properties(10_InitRenderPass PROPERTIES FOLDER "Samples") -target_link_libraries(10_InitRenderPass "$ENV{VULKAN_SDK}/Lib/vulkan-1.lib") +target_link_libraries(10_InitRenderPass "${Vulkan_LIBRARIES}") diff --git a/samples/11_InitShaders/CMakeLists.txt b/samples/11_InitShaders/CMakeLists.txt index 95db820..bf462db 100644 --- a/samples/11_InitShaders/CMakeLists.txt +++ b/samples/11_InitShaders/CMakeLists.txt @@ -37,5 +37,5 @@ add_executable(11_InitShaders set_target_properties(11_InitShaders PROPERTIES FOLDER "Samples") target_include_directories(11_InitShaders PUBLIC ${CMAKE_SOURCE_DIR}/glslang) -target_link_libraries(11_InitShaders PUBLIC glslang SPIRV "$ENV{VULKAN_SDK}/Lib/vulkan-1.lib" +target_link_libraries(11_InitShaders PUBLIC glslang SPIRV "${Vulkan_LIBRARIES}" ) diff --git a/samples/12_InitFrameBuffers/CMakeLists.txt b/samples/12_InitFrameBuffers/CMakeLists.txt index 5982526..c313c0e 100644 --- a/samples/12_InitFrameBuffers/CMakeLists.txt +++ b/samples/12_InitFrameBuffers/CMakeLists.txt @@ -35,5 +35,5 @@ add_executable(12_InitFrameBuffers set_target_properties(12_InitFrameBuffers PROPERTIES FOLDER "Samples") target_include_directories(12_InitFrameBuffers PUBLIC ${CMAKE_SOURCE_DIR}/glslang) -target_link_libraries(12_InitFrameBuffers PUBLIC glslang SPIRV "$ENV{VULKAN_SDK}/Lib/vulkan-1.lib" +target_link_libraries(12_InitFrameBuffers PUBLIC glslang SPIRV "${Vulkan_LIBRARIES}" ) diff --git a/samples/13_InitVertexBuffer/CMakeLists.txt b/samples/13_InitVertexBuffer/CMakeLists.txt index 0a3e955..176a379 100644 --- a/samples/13_InitVertexBuffer/CMakeLists.txt +++ b/samples/13_InitVertexBuffer/CMakeLists.txt @@ -36,5 +36,5 @@ add_executable(13_InitVertexBuffer set_target_properties(13_InitVertexBuffer PROPERTIES FOLDER "Samples") target_include_directories(13_InitVertexBuffer PUBLIC ${CMAKE_SOURCE_DIR}/glslang) -target_link_libraries(13_InitVertexBuffer PUBLIC glslang SPIRV "$ENV{VULKAN_SDK}/Lib/vulkan-1.lib" +target_link_libraries(13_InitVertexBuffer PUBLIC glslang SPIRV "${Vulkan_LIBRARIES}" ) diff --git a/samples/14_InitPipeline/CMakeLists.txt b/samples/14_InitPipeline/CMakeLists.txt index cc416b4..bcf3d26 100644 --- a/samples/14_InitPipeline/CMakeLists.txt +++ b/samples/14_InitPipeline/CMakeLists.txt @@ -40,5 +40,5 @@ add_executable(14_InitPipeline set_target_properties(14_InitPipeline PROPERTIES FOLDER "Samples") target_include_directories(14_InitPipeline PUBLIC ${CMAKE_SOURCE_DIR}/glslang) -target_link_libraries(14_InitPipeline PUBLIC glslang SPIRV "$ENV{VULKAN_SDK}/Lib/vulkan-1.lib" +target_link_libraries(14_InitPipeline PUBLIC glslang SPIRV "${Vulkan_LIBRARIES}" ) diff --git a/samples/15_DrawCube/CMakeLists.txt b/samples/15_DrawCube/CMakeLists.txt index 340c547..7189603 100644 --- a/samples/15_DrawCube/CMakeLists.txt +++ b/samples/15_DrawCube/CMakeLists.txt @@ -40,5 +40,5 @@ add_executable(15_DrawCube set_target_properties(15_DrawCube PROPERTIES FOLDER "Samples") target_include_directories(15_DrawCube PUBLIC ${CMAKE_SOURCE_DIR}/glslang) -target_link_libraries(15_DrawCube PUBLIC glslang SPIRV "$ENV{VULKAN_SDK}/Lib/vulkan-1.lib" +target_link_libraries(15_DrawCube PUBLIC glslang SPIRV "${Vulkan_LIBRARIES}" ) diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt index 8a73371..1b22592 100644 --- a/samples/CMakeLists.txt +++ b/samples/CMakeLists.txt @@ -14,6 +14,8 @@ cmake_minimum_required(VERSION 3.2) +find_package(Vulkan REQUIRED) + project(Vulkan-Hpp_Samples) option (SAMPLES_BUILD_WITH_LOCAL_VULKAN_HPP OFF) @@ -30,7 +32,7 @@ if (SAMPLES_BUILD_WITH_LOCAL_VULKAN_HPP) include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../Vulkan-Docs/include") include_directories("${CMAKE_CURRENT_SOURCE_DIR}/..") else() - include_directories("$ENV{VK_SDK_PATH}/include") + include_directories("${Vulkan_INCLUDE_DIRS}") endif() include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../glm") diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index c74563d..923632b 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -14,6 +14,8 @@ cmake_minimum_required(VERSION 3.2) +find_package(Vulkan REQUIRED) + project(Vulkan-Hpp_Tests) option (TESTS_BUILD_WITH_LOCAL_VULKAN_HPP OFF) @@ -30,7 +32,7 @@ if (TESTS_BUILD_WITH_LOCAL_VULKAN_HPP) include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../Vulkan-Docs/include") include_directories("${CMAKE_CURRENT_SOURCE_DIR}/..") else() - include_directories("$ENV{VK_SDK_PATH}/include") + include_directories("${Vulkan_INCLUDE_DIRS}") endif() include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../glm") diff --git a/tests/DeviceFunctions/CMakeLists.txt b/tests/DeviceFunctions/CMakeLists.txt index 46a6de5..ffea320 100644 --- a/tests/DeviceFunctions/CMakeLists.txt +++ b/tests/DeviceFunctions/CMakeLists.txt @@ -32,4 +32,4 @@ add_executable(DeviceFunctions ) set_target_properties(DeviceFunctions PROPERTIES FOLDER "Tests") -target_link_libraries(DeviceFunctions "$ENV{VULKAN_SDK}/Lib/vulkan-1.lib") +target_link_libraries(DeviceFunctions "${Vulkan_LIBRARIES}") diff --git a/tests/NoExceptions/CMakeLists.txt b/tests/NoExceptions/CMakeLists.txt index f22ff5e..510e06f 100644 --- a/tests/NoExceptions/CMakeLists.txt +++ b/tests/NoExceptions/CMakeLists.txt @@ -32,4 +32,4 @@ add_executable(NoExceptions ) set_target_properties(NoExceptions PROPERTIES FOLDER "Tests") -target_link_libraries(NoExceptions "$ENV{VULKAN_SDK}/Lib/vulkan-1.lib") +target_link_libraries(NoExceptions "${Vulkan_LIBRARIES}") diff --git a/tests/StructureChain/CMakeLists.txt b/tests/StructureChain/CMakeLists.txt index 275bd51..19ecbbd 100644 --- a/tests/StructureChain/CMakeLists.txt +++ b/tests/StructureChain/CMakeLists.txt @@ -32,4 +32,4 @@ add_executable(StructureChain ) set_target_properties(StructureChain PROPERTIES FOLDER "Tests") -target_link_libraries(StructureChain "$ENV{VULKAN_SDK}/Lib/vulkan-1.lib") +target_link_libraries(StructureChain "${Vulkan_LIBRARIES}")