diff options
| author | Simo Fält <simo.falt@qt.io> | 2021-06-01 09:18:20 +0300 |
|---|---|---|
| committer | Simo Fält <simo.falt@qt.io> | 2021-06-03 09:25:30 +0300 |
| commit | 52bd6da0410a9fff28be04b386d323d72be83f02 (patch) | |
| tree | eb0d6b24f0c4c32f10a92972ef2aa2bcdf01092e | |
| parent | 3fd82a915c141381bec6c937c988a6ad6aa81ae6 (diff) | |
Hide LLVM_INSTALL_DIR from qdoc in Windows
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>
| -rw-r--r-- | coin/platform_configs/installer-framework.yaml | 2 | ||||
| -rw-r--r-- | coin/platform_configs/tqtc-installer-framework.yaml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/coin/platform_configs/installer-framework.yaml b/coin/platform_configs/installer-framework.yaml index 5fc8af6b..555b520f 100644 --- a/coin/platform_configs/installer-framework.yaml +++ b/coin/platform_configs/installer-framework.yaml @@ -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' diff --git a/coin/platform_configs/tqtc-installer-framework.yaml b/coin/platform_configs/tqtc-installer-framework.yaml index 432d59b2..45577e9a 100644 --- a/coin/platform_configs/tqtc-installer-framework.yaml +++ b/coin/platform_configs/tqtc-installer-framework.yaml @@ -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' |