From b4b1ee123681983a53c07ee6bed711b7c6979c36 Mon Sep 17 00:00:00 2001 From: JackCarterSmith Date: Wed, 5 Feb 2025 23:28:26 +0100 Subject: [PATCH] Fix conan requirements failure --- conanfile.py | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/conanfile.py b/conanfile.py index 76a10b3..d1ffc29 100644 --- a/conanfile.py +++ b/conanfile.py @@ -1,12 +1,13 @@ from conan import ConanFile -from conan.tools.cmake import CMakeToolchain +from conan.tools.cmake import CMakeToolchain,cmake_layout from conan.tools.files import copy +import os -required_conan_version = ">=1.59" +required_conan_version = ">=2.0.0" class AST(ConanFile): name = "AST" - version = "0.4" + version = "1.0.0" description = """Old school project Turn based strategy game""" license = "MIT" @@ -50,11 +51,12 @@ class AST(ConanFile): self.options["sdl_image"].shared = True def requirements(self): - self.requires("sdl/2.30.7", override=True) - self.requires("sdl_image/[>=2.6.3 <2.7]") + self.requires("sdl/2.30.9", force=True) + self.requires("sdl_image/[~2.8]") -# def layout(self): -# cmake_layout(self, src_folder='.', build_folder='build') + def layout(self): + self.folders.build_folder_vars = ["settings.os", "settings.compiler", "settings.build_type"] + cmake_layout(self) def generate(self): # cmake = CMakeDeps(self) @@ -65,8 +67,11 @@ class AST(ConanFile): #tc.user_presets_path = False tc.generate() for dep in self.dependencies.values(): - if self.settings.os == "Windows": - copy(self, "*.dll", dep.cpp_info.bindirs[0], self.build_folder) + if len(dep.cpp_info.bindirs) > 0: + if self.settings.os == "Windows": + copy(self, "*.dll", dep.cpp_info.bindirs[0], os.path.join(self.build_folder, "bin")) + else: + copy(self, "*.so", dep.cpp_info.bindirs[0], os.path.join(self.build_folder, "bin")) # def package(self): # copy(self, "LICENSE", src=self.source_folder, dst=os.path.join(self.package_folder, "licenses"))