Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-21 13:13:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

build-deps.py: shortcut for getting active toolset

Browse Source
This commit is contained in:
Andrej730
2026-09-11 11:05:21 +05:00
parent fb0a826ac9
commit 7f9423daa6
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
win/installers.py
+2 -2
View File
@@ -723,7 +723,7 @@ def install_mpfr(
orig_generator = CMAKE_GENERATORS["Visual Studio 16 2019"] orig_generator = CMAKE_GENERATORS["Visual Studio 16 2019"]
orig_platform_toolset = orig_generator.vs_toolset orig_platform_toolset = orig_generator.vs_toolset
target_toolset = vs_cfg_vars.vs_toolset_override or vs_cfg_vars.generator.vs_toolset target_toolset = vs_cfg_vars.vs_toolset
for vcxproj in (dependency_dir / mpfr_sln_dir).rglob("*.vcxproj"): for vcxproj in (dependency_dir / mpfr_sln_dir).rglob("*.vcxproj"):
vcxproj.write_text(vcxproj.read_text().replace(orig_platform_toolset, target_toolset)) vcxproj.write_text(vcxproj.read_text().replace(orig_platform_toolset, target_toolset))
@@ -765,7 +765,7 @@ def install_qt6(
build_deps_cache.add_entry("QT6_VERSION", QT6_VERSION) build_deps_cache.add_entry("QT6_VERSION", QT6_VERSION)
vs_toolset = vs_cfg_vars.vs_toolset_override or vs_cfg_vars.generator.vs_toolset vs_toolset = vs_cfg_vars.vs_toolset
QT6_MSVC_YEAR = VS_TOOLSET_TO_VS_VER[vs_toolset] QT6_MSVC_YEAR = VS_TOOLSET_TO_VS_VER[vs_toolset]
# Qt has not published prebuilt msvc2026 binaries yet (aqt only lists win64_msvc2022_64 as of # Qt has not published prebuilt msvc2026 binaries yet (aqt only lists win64_msvc2022_64 as of
# Qt 6.7-6.10). The v14x MSVC toolsets share a stable ABI/CRT, so fall back to the msvc2022 # Qt 6.7-6.10). The v14x MSVC toolsets share a stable ABI/CRT, so fall back to the msvc2022
win/vs_cfg.py
+5
View File
@@ -95,6 +95,11 @@ class VsCfgResult(NamedTuple):
"""Compare against `vs_platform`, just to prevent typos.""" """Compare against `vs_platform`, just to prevent typos."""
return self.vs_platform == platform return self.vs_platform == platform
@property
def vs_toolset(self) -> str:
"""Effective toolset: `vs_toolset_override` if set, else the generator's default."""
return self.vs_toolset_override or self.generator.vs_toolset
VS_TOOLSET_TO_VC_VER = {info.vs_toolset: info.vc_ver for info in CMAKE_GENERATORS.values()} VS_TOOLSET_TO_VC_VER = {info.vs_toolset: info.vc_ver for info in CMAKE_GENERATORS.values()}
"""E.g. "v142" -> "14.2".""" """E.g. "v142" -> "14.2"."""