diff --git a/FindVulkan.cmake b/FindVulkan.cmake index 41496a6..607d985 100644 --- a/FindVulkan.cmake +++ b/FindVulkan.cmake @@ -42,6 +42,8 @@ if(WIN32) "$ENV{VULKAN_SDK}/Lib" "$ENV{VULKAN_SDK}/Bin" ) + + set(Vulkan_LIBRARIES_DIR $ENV{VULKAN_SDK}/Lib) elseif(CMAKE_SIZEOF_VOID_P EQUAL 4) find_library(Vulkan_LIBRARY NAMES vulkan-1 @@ -50,6 +52,8 @@ if(WIN32) "$ENV{VULKAN_SDK}/Bin32" NO_SYSTEM_ENVIRONMENT_PATH ) + + set(Vulkan_LIBRARIES_DIR $ENV{VULKAN_SDK}/Lib32) endif() else() find_path(Vulkan_INCLUDE_DIR @@ -60,6 +64,8 @@ else() NAMES vulkan PATHS "$ENV{VULKAN_SDK}/lib") + + set(Vulkan_LIBRARIES_DIR $ENV{VULKAN_SDK}/Lib) endif() set(Vulkan_LIBRARIES ${Vulkan_LIBRARY}) diff --git a/vulkan.cmake b/vulkan.cmake index 7dc3509..38a4845 100644 --- a/vulkan.cmake +++ b/vulkan.cmake @@ -2,8 +2,6 @@ include(FindVulkan) if(CMAKE_SYSTEM_NAME STREQUAL "Windows") add_definitions(-DVK_USE_PLATFORM_WIN32_KHR -DWIN32_LEAN_AND_MEAN) - - include_directories(${Vulkan_INCLUDE_DIRS}) elseif(CMAKE_SYSTEM_NAME STREQUAL "Android") add_definitions(-DVK_USE_PLATFORM_ANDROID_KHR) elseif(UNIX) @@ -11,6 +9,7 @@ elseif(UNIX) SET(RENDER_LIBRARY xcb) else() message(FATAL_ERROR "Unsupported Vulkan Platform!") -ENDIF() +endif() include_directories(${Vulkan_INCLUDE_DIRS}) +link_directories(${Vulkan_LIBRARIES_DIR})