hyzboy/CMCMakeModule
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加使用官方VulkanSDK中的lib路径配置

Browse Source
This commit is contained in:
hyzboy 2020-06-05 01:08:45 +08:00
parent 4ac904d834
commit 9f0d185346
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
FindVulkan.cmake
View File

@ -42,6 +42,8 @@ if(WIN32)
"$ENV{VULKAN_SDK}/Lib" "$ENV{VULKAN_SDK}/Lib"
"$ENV{VULKAN_SDK}/Bin" "$ENV{VULKAN_SDK}/Bin"
) )
set(Vulkan_LIBRARIES_DIR $ENV{VULKAN_SDK}/Lib)
elseif(CMAKE_SIZEOF_VOID_P EQUAL 4) elseif(CMAKE_SIZEOF_VOID_P EQUAL 4)
find_library(Vulkan_LIBRARY find_library(Vulkan_LIBRARY
NAMES vulkan-1 NAMES vulkan-1
@ -50,6 +52,8 @@ if(WIN32)
"$ENV{VULKAN_SDK}/Bin32" "$ENV{VULKAN_SDK}/Bin32"
NO_SYSTEM_ENVIRONMENT_PATH NO_SYSTEM_ENVIRONMENT_PATH
) )
set(Vulkan_LIBRARIES_DIR $ENV{VULKAN_SDK}/Lib32)
endif() endif()
else() else()
find_path(Vulkan_INCLUDE_DIR find_path(Vulkan_INCLUDE_DIR
@ -60,6 +64,8 @@ else()
NAMES vulkan NAMES vulkan
PATHS PATHS
"$ENV{VULKAN_SDK}/lib") "$ENV{VULKAN_SDK}/lib")
set(Vulkan_LIBRARIES_DIR $ENV{VULKAN_SDK}/Lib)
endif() endif()
set(Vulkan_LIBRARIES ${Vulkan_LIBRARY}) set(Vulkan_LIBRARIES ${Vulkan_LIBRARY})

5
vulkan.cmake
View File

@ -2,8 +2,6 @@ include(FindVulkan)
if(CMAKE_SYSTEM_NAME STREQUAL "Windows") if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
add_definitions(-DVK_USE_PLATFORM_WIN32_KHR -DWIN32_LEAN_AND_MEAN) add_definitions(-DVK_USE_PLATFORM_WIN32_KHR -DWIN32_LEAN_AND_MEAN)
include_directories(${Vulkan_INCLUDE_DIRS})
elseif(CMAKE_SYSTEM_NAME STREQUAL "Android") elseif(CMAKE_SYSTEM_NAME STREQUAL "Android")
add_definitions(-DVK_USE_PLATFORM_ANDROID_KHR) add_definitions(-DVK_USE_PLATFORM_ANDROID_KHR)
elseif(UNIX) elseif(UNIX)
@ -11,6 +9,7 @@ elseif(UNIX)
SET(RENDER_LIBRARY xcb) SET(RENDER_LIBRARY xcb)
else() else()
message(FATAL_ERROR "Unsupported Vulkan Platform!") message(FATAL_ERROR "Unsupported Vulkan Platform!")
ENDIF() endif()
include_directories(${Vulkan_INCLUDE_DIRS}) include_directories(${Vulkan_INCLUDE_DIRS})
link_directories(${Vulkan_LIBRARIES_DIR})