Prefer lib from installed SDK if present, update Linux library

This commit is contained in:
Sascha Willems 2016-11-05 17:17:46 +01:00
parent a4df583cd5
commit f8766d8ce7
2 changed files with 1 additions and 1 deletions

View file

@ -19,7 +19,7 @@ IF(WIN32)
find_library(ASSIMP_LIBRARIES NAMES assimp libassimp.dll.a PATHS ${CMAKE_SOURCE_DIR}/libs/assimp) find_library(ASSIMP_LIBRARIES NAMES assimp libassimp.dll.a PATHS ${CMAKE_SOURCE_DIR}/libs/assimp)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DVK_USE_PLATFORM_WIN32_KHR") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DVK_USE_PLATFORM_WIN32_KHR")
ELSE(WIN32) ELSE(WIN32)
find_library(VULKAN_LIB NAMES libvulkan.so PATHS ${CMAKE_SOURCE_DIR}/libs/vulkan) find_library(VULKAN_LIB NAMES vulkan HINTS "$ENV{VULKAN_SDK}/lib" "${CMAKE_SOURCE_DIR}/libs/vulkan" REQUIRED)
find_package(ASSIMP REQUIRED) find_package(ASSIMP REQUIRED)
find_package(Threads REQUIRED) find_package(Threads REQUIRED)
IF(USE_D2D_WSI) IF(USE_D2D_WSI)

Binary file not shown.

1
libs/vulkan/libvulkan.so.1 Symbolic link
View file

@ -0,0 +1 @@
libvulkan.so.1.0.30