claude_code/procedural-3d-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #264 from lamikr/master_lamikr

Browse source 
allow bundled Vulkan lib also with newer cmakes
This commit is contained in:
Sascha Willems 2017-01-08 20:29:13 +01:00 • committed by GitHub
commit 9b8e5658ef
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -17,7 +17,7 @@ OPTION(USE_D2D_WSI "Build the project using Direct to Display swapchain" OFF)
# Use FindVulkan module added with CMAKE 3.7 # Use FindVulkan module added with CMAKE 3.7
if (NOT CMAKE_VERSION VERSION_LESS 3.7.0) if (NOT CMAKE_VERSION VERSION_LESS 3.7.0)
message(STATUS "Using module to find Vulkan") message(STATUS "Using module to find Vulkan")
find_package(Vulkan REQUIRED) find_package(Vulkan)
endif() endif()
IF(WIN32) IF(WIN32)
@ -25,6 +25,7 @@ IF(WIN32)
find_library(Vulkan_LIBRARY NAMES vulkan-1 vulkan PATHS ${CMAKE_SOURCE_DIR}/libs/vulkan) find_library(Vulkan_LIBRARY NAMES vulkan-1 vulkan PATHS ${CMAKE_SOURCE_DIR}/libs/vulkan)
IF (Vulkan_LIBRARY) IF (Vulkan_LIBRARY)
set(Vulkan_FOUND ON) set(Vulkan_FOUND ON)
MESSAGE("Using bundled Vulkan library version")
ENDIF() ENDIF()
ENDIF() ENDIF()
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)
@ -34,6 +35,7 @@ ELSE(WIN32)
find_library(Vulkan_LIBRARY NAMES vulkan HINTS "$ENV{VULKAN_SDK}/lib" "${CMAKE_SOURCE_DIR}/libs/vulkan" REQUIRED) find_library(Vulkan_LIBRARY NAMES vulkan HINTS "$ENV{VULKAN_SDK}/lib" "${CMAKE_SOURCE_DIR}/libs/vulkan" REQUIRED)
IF (Vulkan_LIBRARY) IF (Vulkan_LIBRARY)
set(Vulkan_FOUND ON) set(Vulkan_FOUND ON)
MESSAGE("Using bundled Vulkan library version")
ENDIF() ENDIF()
ENDIF() ENDIF()
find_package(ASSIMP REQUIRED) find_package(ASSIMP REQUIRED)