lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-01-07 15:36:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Hide LLVM_INSTALL_DIR from qdoc in Windows

Browse Source 
Currently provisioned libclang is not working with static runtime build
in Windows. To allow integration to pass, we need to skip building of
qdoc by hiding required libs from it.

Change-Id: I2b2bbc20d1bb016552ed1b3d4e70dc9c0544fcce
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
This commit is contained in:
Simo Fält
2021-06-01 09:18:20 +03:00
parent 3fd82a915c
commit 52bd6da041
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coin/platform_configs/installer-framework.yaml
View File

@@ -7,7 +7,7 @@ Configurations:
Target arch: 'x86'
Features: ['Packaging']
Configure arguments: '-opensource -confirm-license -verbose -nomake examples -nomake tests -accessibility -static -release -no-sql-sqlite -no-icu -mp -openssl-linked OPENSSL_LIBS="-llibssl -llibcrypto -lUser32 -lWs2_32 -lAdvapi32 -lCrypt32" -I %STATIC_OPENSSL_INCLUDE_x86% -L %STATIC_OPENSSL_LIB_x86% -prefix c:\Users\qt\work\install -static-runtime'
Environment variables: ['TARGET_ARCHITECTURE=amd64_x86', 'PATH=%PATH%;%CI_JOM_PATH%;C:\Utils\gnuwin32\bin;']
Environment variables: ['TARGET_ARCHITECTURE=amd64_x86', 'PATH=%PATH%;%CI_JOM_PATH%;C:\Utils\gnuwin32\bin;', 'LLVM_INSTALL_DIR=', 'LLVM_INSTALL_DIR_msvc=', 'QDOC_USE_STATIC_LIBCLANG=']
Environment script: ['%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat', 'amd64_x86']
-
Template: 'qtci-macos-10.13-x86_64-2'

2
coin/platform_configs/tqtc-installer-framework.yaml
View File

@@ -8,7 +8,7 @@ Configurations:
Target arch: 'x86'
Features: ['Packaging', 'QtInstaller']
Configure arguments: '-opensource -confirm-license -verbose -nomake examples -nomake tests -accessibility -static -release -no-sql-sqlite -no-icu -mp -openssl-linked OPENSSL_LIBS="-llibssl -llibcrypto -lUser32 -lWs2_32 -lAdvapi32 -lCrypt32" -I %STATIC_OPENSSL_INCLUDE_x86% -L %STATIC_OPENSSL_LIB_x86% -prefix c:\Users\qt\work\install -static-runtime'
Environment variables: ['TARGET_ARCHITECTURE=amd64_x86', 'PATH=%PATH%;%CI_JOM_PATH%;C:\Utils\gnuwin32\bin;']
Environment variables: ['TARGET_ARCHITECTURE=amd64_x86', 'PATH=%PATH%;%CI_JOM_PATH%;C:\Utils\gnuwin32\bin;', 'LLVM_INSTALL_DIR=', 'LLVM_INSTALL_DIR_msvc=', 'QDOC_USE_STATIC_LIBCLANG=']
Environment script: ['%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat', 'amd64_x86']
-
Template: 'qtci-macos-10.13-x86_64-2'