diff options
| author | Charles Giessen <charles@lunarg.com> | 2023-08-25 10:53:04 -0600 |
|---|---|---|
| committer | Juan Ramos <114601453+juan-lunarg@users.noreply.github.com> | 2023-09-20 08:31:22 -0600 |
| commit | 54f0d66861b0586e49c0b6b2e301d44cdfe86a30 (patch) | |
| tree | 2e7bb229cf571950df91eefe731a9f92c12117d7 /cube | |
| parent | 1ecbed6db368efc5dab956974d660e79faf28a0f (diff) | |
| download | usermoji-54f0d66861b0586e49c0b6b2e301d44cdfe86a30.tar.xz | |
build: Use Vulkan-Loader find_package support
The Vulkan-Loader now supports find_package properly, allowing this repo to drop
the ad-hoc creation of the Vulkan::Vulkan target.
Diffstat (limited to 'cube')
| -rw-r--r-- | cube/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | cube/macOS/cube/cube.cmake | 2 | ||||
| -rw-r--r-- | cube/macOS/cubepp/cubepp.cmake | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/cube/CMakeLists.txt b/cube/CMakeLists.txt index 02674f75..1fa75d7f 100644 --- a/cube/CMakeLists.txt +++ b/cube/CMakeLists.txt @@ -186,7 +186,7 @@ elseif(NOT WIN32) cube.vert.inc cube.frag.inc ${OPTIONAL_WAYLAND_DATA_FILES}) - target_link_libraries(vkcube Vulkan::Vulkan) + target_link_libraries(vkcube Vulkan::Headers Vulkan::Loader) target_compile_definitions(vkcube PUBLIC ${CUBE_PLATFORM}) include(CheckLibraryExists) CHECK_LIBRARY_EXISTS("rt" clock_gettime "" NEED_RT) @@ -212,7 +212,7 @@ else() ${PROJECT_SOURCE_DIR}/cube/cube.frag cube.vert.inc cube.frag.inc) - target_link_libraries(vkcube Vulkan::Vulkan) + target_link_libraries(vkcube Vulkan::Headers Vulkan::Loader) endif() if(APPLE) @@ -241,7 +241,7 @@ elseif(NOT WIN32) cube.vert.inc cube.frag.inc ${OPTIONAL_WAYLAND_DATA_FILES}) - target_link_libraries(vkcubepp Vulkan::Vulkan) + target_link_libraries(vkcubepp Vulkan::Headers Vulkan::Loader) target_compile_definitions(vkcubepp PUBLIC ${CUBE_PLATFORM}) if (ENABLE_ADDRESS_SANITIZER) @@ -262,7 +262,7 @@ else() ${PROJECT_SOURCE_DIR}/cube/cube.frag cube.vert.inc cube.frag.inc) - target_link_libraries(vkcubepp Vulkan::Vulkan) + target_link_libraries(vkcubepp Vulkan::Headers Vulkan::Loader) endif() if(APPLE) @@ -298,7 +298,7 @@ if(UNIX AND NOT APPLE) # i.e. Linux cube.vert.inc cube.frag.inc ${OPTIONAL_WAYLAND_DATA_FILES}) - target_link_libraries(vkcube-wayland Vulkan::Vulkan) + target_link_libraries(vkcube-wayland Vulkan::Headers Vulkan::Loader) target_compile_definitions(vkcube-wayland PUBLIC VK_USE_PLATFORM_WAYLAND_KHR) include(CheckLibraryExists) CHECK_LIBRARY_EXISTS("rt" clock_gettime "" NEED_RT) diff --git a/cube/macOS/cube/cube.cmake b/cube/macOS/cube/cube.cmake index 9b823f95..ee98135d 100644 --- a/cube/macOS/cube/cube.cmake +++ b/cube/macOS/cube/cube.cmake @@ -55,7 +55,7 @@ add_dependencies(vkcube MoltenVK_icd-staging-json) target_include_directories(vkcube PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${MOLTENVK_DIR}/MoltenVK/include) # We do this so vulkaninfo is linked to an individual library and NOT a framework. -target_link_libraries(vkcube ${Vulkan_LIBRARY} "-framework Cocoa -framework QuartzCore") +target_link_libraries(vkcube Vulkan::Loader "-framework Cocoa -framework QuartzCore") set_target_properties(vkcube PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/macOS/cube/Info.plist) diff --git a/cube/macOS/cubepp/cubepp.cmake b/cube/macOS/cubepp/cubepp.cmake index eae4de3c..4ff82b6b 100644 --- a/cube/macOS/cubepp/cubepp.cmake +++ b/cube/macOS/cubepp/cubepp.cmake @@ -57,7 +57,7 @@ add_dependencies(vkcubepp MoltenVK_icd-staging-json) target_include_directories(vkcubepp PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${MOLTENVK_DIR}/MoltenVK/include) # We do this so vulkaninfo is linked to an individual library and NOT a framework. -target_link_libraries(vkcubepp ${Vulkan_LIBRARY} "-framework Cocoa -framework QuartzCore") +target_link_libraries(vkcubepp Vulkan::Loader "-framework Cocoa -framework QuartzCore") set_target_properties(vkcubepp PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/macOS/cubepp/Info.plist) |