From e80faf80b2bf9da7d2bc2bfdbffb866c5f15857d Mon Sep 17 00:00:00 2001 From: Piotr Krygier Date: Wed, 21 May 2025 12:41:39 +0200 Subject: [PATCH] Add Conan for dependencies --- CMakeLists.txt | 2 +- conanfile.txt | 9 +++++++++ graphics/CMakeLists.txt | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 conanfile.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 9b24ce46..572878f1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.12) +cmake_minimum_required(VERSION 3.23) project("RedScarfEngine" VERSION 0.0.1 DESCRIPTION "Vulkan based 3D engine" diff --git a/conanfile.txt b/conanfile.txt new file mode 100644 index 00000000..d7885a80 --- /dev/null +++ b/conanfile.txt @@ -0,0 +1,9 @@ +[requires] +vulkan-headers/1.4.309.0 +glfw/3.4 +freetype/2.13.3 + +[generators] +CMakeDeps +CMakeToolchain + diff --git a/graphics/CMakeLists.txt b/graphics/CMakeLists.txt index 65cf16ca..5bdf0821 100644 --- a/graphics/CMakeLists.txt +++ b/graphics/CMakeLists.txt @@ -1,5 +1,4 @@ find_package(Vulkan REQUIRED) -find_package(VulkanMemoryAllocator CONFIG REQUIRED) find_package(glfw3 REQUIRED) find_package(FreeType REQUIRED) @@ -42,6 +41,7 @@ add_library(graphics SHARED ) target_include_directories(graphics PRIVATE ${PROJECT_SOURCE_DIR} +${PROJECT_SOURCE_DIR}/third_party/include/ ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR} ${Vulkan_INCLUDE_DIR}