check_installation for qt6 - was not aware of this bit

This commit is contained in:
Thomas Krijnen
2026-05-08 19:08:08 +02:00
parent 7d0b6f6fd8
commit cf257aa20a
2 changed files with 29 additions and 14 deletions
+12 -3
View File
@@ -741,7 +741,7 @@ IF NOT %ERRORLEVEL%==0 GOTO :Error
call :MarkInstallation call :MarkInstallation
:qt6 :qt6
set DEPENDENCY_NAME=Qt6 %QT6_VERSION% set DEPENDENCY_NAME=qt6
set QT6_MSVC_YEAR=%VS_VER% set QT6_MSVC_YEAR=%VS_VER%
IF /I "%VS_TOOLSET%"=="v141" set QT6_MSVC_YEAR=2017 IF /I "%VS_TOOLSET%"=="v141" set QT6_MSVC_YEAR=2017
@@ -769,6 +769,10 @@ set DEPENDENCY_INSTALL_NAME=qt6-%QT6_VERSION%-%QT6_INSTALL_SUFFIX%
set QT6_AQT_OUTPUT_DIR=%INSTALL_DIR%\%DEPENDENCY_INSTALL_NAME% set QT6_AQT_OUTPUT_DIR=%INSTALL_DIR%\%DEPENDENCY_INSTALL_NAME%
set QT6_INSTALL_DIR=%QT6_AQT_OUTPUT_DIR%\%QT6_VERSION%\%QT6_INSTALL_SUFFIX% set QT6_INSTALL_DIR=%QT6_AQT_OUTPUT_DIR%\%QT6_VERSION%\%QT6_INSTALL_SUFFIX%
set QT_DIR=%QT6_INSTALL_DIR% set QT_DIR=%QT6_INSTALL_DIR%
set QT6_CONFIG_DLL=Qt6Core.dll
IF /I "%BUILD_CFG%"=="Debug" (
set QT6_CONFIG_DLL=Qt6Cored.dll
)
set NEXT_DEPENDENCY_LABEL=Successful set NEXT_DEPENDENCY_LABEL=Successful
IF NOT "%IFCOS_INSTALL_QT6%"=="TRUE" ( IF NOT "%IFCOS_INSTALL_QT6%"=="TRUE" (
@@ -782,8 +786,8 @@ echo QT_DIR=%QT_DIR%>>"%~dp0\%BUILD_DEPS_CACHE_PATH%"
call :CheckInstallation call :CheckInstallation
if %ERRORLEVEL%==200 GOTO %NEXT_DEPENDENCY_LABEL% if %ERRORLEVEL%==200 GOTO %NEXT_DEPENDENCY_LABEL%
IF EXIST "%QT6_INSTALL_DIR%\lib\cmake\Qt6\Qt6Config.cmake" ( IF EXIST "%QT6_INSTALL_DIR%\bin\%QT6_CONFIG_DLL%" (
echo Found existing "%QT6_INSTALL_DIR%", skipping echo Found existing "%QT6_INSTALL_DIR%" for %BUILD_CFG%, skipping
call :MarkInstallation call :MarkInstallation
goto :Successful goto :Successful
) )
@@ -802,6 +806,11 @@ IF NOT EXIST "%QT6_INSTALL_DIR%\lib\cmake\Qt6\Qt6Config.cmake" (
GOTO :Error GOTO :Error
) )
IF NOT EXIST "%QT6_INSTALL_DIR%\bin\%QT6_CONFIG_DLL%" (
call cecho.cmd 0 12 "Qt6 installation did not produce %BUILD_CFG% runtime %QT6_CONFIG_DLL% at %QT6_INSTALL_DIR%\bin."
GOTO :Error
)
call :MarkInstallation call :MarkInstallation
goto :Successful goto :Successful
+6
View File
@@ -56,6 +56,11 @@ function mark_based_on_artifacts {
$artifact = "lib\rocksdb.lib" $artifact = "lib\rocksdb.lib"
} }
} }
elseif ($dependency_name -eq "qt6") {
# Qt has a nested install layout, so build-deps.cmd validates its
# Release/Debug artifacts before marking the installation.
return
}
else { else {
throw "Unexpected dependency name '$dependency_name'." throw "Unexpected dependency name '$dependency_name'."
} }
@@ -104,6 +109,7 @@ function check_installation {
# - OpenCASCADE: incompatible # - OpenCASCADE: incompatible
# - rocksdb: incompatible # - rocksdb: incompatible
# - opencollada: incompatible # - opencollada: incompatible
# - Qt6: compatible when both Release and Debug artifacts are installed
# - zstd: compatible # - zstd: compatible
function setup_build_cfg { function setup_build_cfg {