games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-23 22:37:55 +02:00
Code Issues Releases Activity

[conan][windows] allow Boost versions up to 1.87 when targeting Windows < 10

Browse Source 
adds new option for that
This commit is contained in:
Andrey Filipenkov
2025-03-15 21:33:46 +03:00
parent c376507dac
commit 026e9c5f8f
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
conanfile.py
View File

@@ -15,7 +15,6 @@ class VCMI(ConanFile):
generators = "CMakeDeps" generators = "CMakeDeps"
_libRequires = [ _libRequires = [
"boost/[^1.69]",
"luajit/2.1.0-beta3", "luajit/2.1.0-beta3",
"minizip/[^1.2.12]", "minizip/[^1.2.12]",
"zlib/[^1.2.12]", "zlib/[^1.2.12]",
@@ -32,9 +31,11 @@ class VCMI(ConanFile):
requires = _libRequires + _clientRequires + _launcherRequires requires = _libRequires + _clientRequires + _launcherRequires
options = { options = {
"target_pre_windows10": [True, False],
"with_ffmpeg": [True, False], "with_ffmpeg": [True, False],
} }
default_options = { default_options = {
"target_pre_windows10": False,
"with_ffmpeg": True, "with_ffmpeg": True,
} }
@@ -53,7 +54,18 @@ class VCMI(ConanFile):
if self.settings.os == "Android": if self.settings.os == "Android":
self.options["qt"].android_sdk = os.getenv("ANDROID_HOME") self.options["qt"].android_sdk = os.getenv("ANDROID_HOME")
if self.settings.os != "Windows":
del self.options.target_pre_windows10
def requirements(self): def requirements(self):
# lib
# boost::filesystem removed support for Windows < 10 in v1.87
boostMinVersion = "1.69"
if self.options.get_safe("target_pre_windows10", False):
self.requires(f"boost/[>={boostMinVersion} <1.87]")
else:
self.requires(f"boost/[^{boostMinVersion}]")
# client # client
if self.options.with_ffmpeg: if self.options.with_ffmpeg:
self.requires("ffmpeg/[>=4.4]") self.requires("ffmpeg/[>=4.4]")