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

build-deps: remove unnecessary mark installation for qt6

Browse Source
This commit is contained in:
Andrej730
2026-09-14 16:18:48 +05:00
parent b59dc01019
commit 1cadd711f1
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
win/build-deps.cmd
+3 -2
View File
@@ -805,7 +805,6 @@ IF DEFINED QT6_HOST_INSTALL_DIR (
IF "%QT6_TARGET_INSTALLED%"=="TRUE" IF "%QT6_HOST_INSTALLED%"=="TRUE" ( IF "%QT6_TARGET_INSTALLED%"=="TRUE" IF "%QT6_HOST_INSTALLED%"=="TRUE" (
echo Found existing "%QT6_INSTALL_DIR%" for %BUILD_CFG%, skipping echo Found existing "%QT6_INSTALL_DIR%" for %BUILD_CFG%, skipping
IF DEFINED QT6_HOST_INSTALL_DIR echo Found existing Qt host tools at "%QT6_HOST_INSTALL_DIR%", skipping IF DEFINED QT6_HOST_INSTALL_DIR echo Found existing Qt host tools at "%QT6_HOST_INSTALL_DIR%", skipping
call :MarkInstallation
goto %NEXT_DEPENDENCY_LABEL% goto %NEXT_DEPENDENCY_LABEL%
) )
@@ -819,6 +818,9 @@ IF NOT "%QT6_TARGET_INSTALLED%"=="TRUE" (
REM Keep the install lean by filtering archives: qtbase provides REM Keep the install lean by filtering archives: qtbase provides
REM Core/Gui/Widgets (and the Qt6::CorePrivate target), qtsvg provides REM Core/Gui/Widgets (and the Qt6::CorePrivate target), qtsvg provides
REM Qt6::Svg. Both are base-Qt archives, not add-on modules. REM Qt6::Svg. Both are base-Qt archives, not add-on modules.
REM Qt's official archives always bundle both RelWithDebInfo and Debug builds together.
REM aqtinstall has no option to download only one of them, or other configs
REM (Release/MinSizeRel) instead.
%AQT_PYTHON% -m aqt install-qt windows desktop %QT6_VERSION% %QT6_ARCH% -O "%QT6_AQT_OUTPUT_DIR%" --archives qtbase qtsvg %AQT_PYTHON% -m aqt install-qt windows desktop %QT6_VERSION% %QT6_ARCH% -O "%QT6_AQT_OUTPUT_DIR%" --archives qtbase qtsvg
IF ERRORLEVEL 1 GOTO :Error IF ERRORLEVEL 1 GOTO :Error
) )
@@ -862,7 +864,6 @@ IF DEFINED QT6_HOST_INSTALL_DIR (
) )
) )
call :MarkInstallation
goto %NEXT_DEPENDENCY_LABEL% goto %NEXT_DEPENDENCY_LABEL%
:manifold :manifold
win/installers.py
+3 -4
View File
@@ -845,7 +845,6 @@ def install_qt6(
logger.info(f"Found existing '{QT6_INSTALL_DIR}' for {build_cfg}, skipping") logger.info(f"Found existing '{QT6_INSTALL_DIR}' for {build_cfg}, skipping")
if QT6_CROSS_COMPILING: if QT6_CROSS_COMPILING:
logger.info(f"Found existing Qt host tools at '{QT6_HOST_INSTALL_DIR}', skipping") logger.info(f"Found existing Qt host tools at '{QT6_HOST_INSTALL_DIR}', skipping")
mark_installation(QT6_INSTALL_DIR, build_cfg)
return return
def install_via_pip(python_exe: str) -> tuple[str, ...]: def install_via_pip(python_exe: str) -> tuple[str, ...]:
@@ -869,6 +868,9 @@ def install_qt6(
AQT_CMD = install_via_pip(AQT_PYTHON) AQT_CMD = install_via_pip(AQT_PYTHON)
def aqt_install_qt(arch: str, output_dir: Path) -> None: def aqt_install_qt(arch: str, output_dir: Path) -> None:
# Qt's official archives always bundle both RelWithDebInfo and Debug builds together.
# aqtinstall has no option to download only one of them, or other configs
# (Release/MinSizeRel) instead.
run_streamed( run_streamed(
*AQT_CMD, *AQT_CMD,
"install-qt", "install-qt",
@@ -912,9 +914,6 @@ def install_qt6(
for path in QT6_HOST_EXPECTED_FILES: for path in QT6_HOST_EXPECTED_FILES:
require_exists("Qt6 host installation", path) require_exists("Qt6 host installation", path)
# TODO: check if it's actually needed, since we don't use check it.
mark_installation(QT6_INSTALL_DIR, build_cfg)
def install_python( def install_python(
vs_cfg_vars: VsCfgResult, vs_cfg_vars: VsCfgResult,