From 9f0d1853464942576ebf211865d2f285df4ad33d Mon Sep 17 00:00:00 2001 From: hyzboy Date: Fri, 5 Jun 2020 01:08:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BD=BF=E7=94=A8=E5=AE=98?= =?UTF-8?q?=E6=96=B9VulkanSDK=E4=B8=AD=E7=9A=84lib=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FindVulkan.cmake | 6 ++++++ vulkan.cmake | 5 ++--- 2 files changed, 8 insertions(+), 3 deletions(-) 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})