diff --git a/CMakeLists.txt b/CMakeLists.txt index 2a8300a920..6b878e5bbe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,12 +30,15 @@ endif() cmake_minimum_required(VERSION 3.16) +set(VCPKG_PACKAGES catch2 cli11 fmt glm glslang imgui spdlog spirv-cross stb tinygltf vulkan-memory-allocator) include(${CMAKE_CURRENT_SOURCE_DIR}/bldsys/cmake/ezvcpkg.cmake) set(VCPKG_LIBRARY_LINKAGE static) -set(VCPKG_PACKAGES catch2 cli11 fmt glm glslang imgui spdlog spirv-cross stb tinygltf vulkan-memory-allocator) -if ((NOT (CMAKE_SYSTEM_NAME STREQUAL "Android")) AND (NOT (VKB_WSI_SELECTION STREQUAL D2D))) +if (CMAKE_SYSTEM_NAME STREQUAL "Android") + set(VCPKG_TARGET_TRIPLET "arm64-android") +elseif(NOT (VKB_WSI_SELECTION STREQUAL D2D)) list(APPEND VCPKG_PACKAGES glfw3) endif() +set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") ezvcpkg_fetch( COMMIT 2024.01.12 @@ -44,11 +47,14 @@ ezvcpkg_fetch( UPDATE_TOOLCHAIN ) -project(vulkan_samples) +if (NOT (CMAKE_SYSTEM_NAME STREQUAL "Android")) + #list(APPEND CMAKE_PREFIX_PATH ${EZVCPKG_DIR} ${EZVCPKG_DIR}/share) +endif() -set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") +project(vulkan_samples) -list(PREPEND CMAKE_PREFIX_PATH ${EZVCPKG_DIR} ${EZVCPKG_DIR}/share) +message(STATUS "CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH}") +message(STATUS "CMAKE_TOOLCHAIN_FILE ${CMAKE_TOOLCHAIN_FILE}") find_package(VulkanMemoryAllocator CONFIG REQUIRED) find_package(glm CONFIG REQUIRED) find_package(fmt CONFIG REQUIRED)