diff options
| author | Simo Fält <simo.falt@qt.io> | 2021-06-01 09:16:41 +0300 |
|---|---|---|
| committer | Simo Fält <simo.falt@qt.io> | 2021-06-03 09:25:27 +0300 |
| commit | 3fd82a915c141381bec6c937c988a6ad6aa81ae6 (patch) | |
| tree | 66b3c769ef109da7d337d2f41e32086a84d6b17a | |
| parent | 00527b1fb4494be11f526b8de260c92f61e2bf06 (diff) | |
Add static-runtime configure argument
Change-Id: I93b7b8bbe795a8a194ac34dca962ddd8956ec1a6
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 377bf750..5fc8af6b 100644 --- a/coin/platform_configs/installer-framework.yaml +++ b/coin/platform_configs/installer-framework.yaml @@ -6,7 +6,7 @@ Configurations: Compiler: 'MSVC2015' 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_static -llibcrypto_static -lUser32 -lWs2_32 -lAdvapi32 -lCrypt32" -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -prefix c:\Users\qt\work\install' + 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 script: ['%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat', 'amd64_x86'] - diff --git a/coin/platform_configs/tqtc-installer-framework.yaml b/coin/platform_configs/tqtc-installer-framework.yaml index 3ff2dea7..432d59b2 100644 --- a/coin/platform_configs/tqtc-installer-framework.yaml +++ b/coin/platform_configs/tqtc-installer-framework.yaml @@ -7,7 +7,7 @@ Configurations: Compiler: 'MSVC2015' 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_static -llibcrypto_static -lUser32 -lWs2_32 -lAdvapi32 -lCrypt32" -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -prefix c:\Users\qt\work\install' + 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 script: ['%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat', 'amd64_x86'] - |