@@ -161,7 +161,7 @@ cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INST
161161cmake --build build --parallel || goto error
162162ninja -C build install || goto error
163163cd .. || goto error
164- tar -xf " freetype-%FREETYPE% .tar.gz " || goto error
164+ rmdir /S /Q " freetype-%FREETYPE% "
165165
166166echo Building HarfBuzz...
167167rmdir /S /Q " harfbuzz-%HARFBUZZ% "
@@ -244,16 +244,23 @@ ninja install || goto error
244244cd ..\.. || goto error
245245rmdir /S /Q " qtshadertools-everywhere-src-%QT% "
246246
247+ rem This mess with the junction is to work around path length limits in cmake/MSVC.
247248echo Building Qt Declarative...
248249rmdir /S /Q " qtdeclarative-everywhere-src-%QT% "
249250%SEVENZIP% x " qtdeclarative-everywhere-src-%QT% .zip" || goto error
250251cd " qtdeclarative-everywhere-src-%QT% " || goto error
252+ set QTDECLARATIVEDIR = %CD%
251253mkdir build || goto error
252- cd build || goto error
253- call " %INSTALLDIR% \bin\qt-configure-module.bat" .. -- %FORCEPDB% -DCMAKE_PREFIX_PATH=" %INSTALLDIR% " -DQT_GENERATE_SBOM=OFF || goto error
254+ pushd ..\..\..\.. || goto error
255+ mklink /J b " %QTDECLARATIVEDIR% \build" || goto error
256+ cd b || goto error
257+ call " %INSTALLDIR% \bin\qt-configure-module.bat" %QTDECLARATIVEDIR% -- %FORCEPDB% -DCMAKE_PREFIX_PATH=" %INSTALLDIR% " -DQT_GENERATE_SBOM=OFF || goto error
254258cmake --build . --parallel || goto error
255259ninja install || goto error
256- cd ..\.. || goto error
260+ cd .. || goto error
261+ rmdir b || goto error
262+ popd || goto error
263+ cd .. || goto error
257264rmdir /S /Q " qtdeclarative-everywhere-src-%QT% "
258265
259266echo Building Qt Tools...
0 commit comments