diff options
| author | Simo Fält <simo.falt@qt.io> | 2023-09-19 09:01:25 +0300 |
|---|---|---|
| committer | Simo Fält <simo.falt@qt.io> | 2023-09-28 07:12:02 +0000 |
| commit | 703af6a36ffa09fec3ccddeec565ac56f7770bbf (patch) | |
| tree | 346c2fcee94253a8ef338bf1f64190091562dfb0 /coin/platform_configs | |
| parent | f3b2983537b558c901b16eeeeb62fc5abec3483e (diff) | |
IFW: Fix cmake args for static building on Windows
Task-number: QTIFW-3158
Change-Id: Ifd8a179e65b758089c2274fdf887d6f4f041afcb
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
Diffstat (limited to 'coin/platform_configs')
| -rw-r--r-- | coin/platform_configs/installer-framework.yaml | 14 | ||||
| -rw-r--r-- | coin/platform_configs/tqtc-installer-framework.yaml | 14 |
2 files changed, 24 insertions, 4 deletions
diff --git a/coin/platform_configs/installer-framework.yaml b/coin/platform_configs/installer-framework.yaml index 920c782c..60b44bdc 100644 --- a/coin/platform_configs/installer-framework.yaml +++ b/coin/platform_configs/installer-framework.yaml @@ -6,8 +6,18 @@ Configurations: Compiler: 'MSVC2019' Target arch: 'x86_64' Features: ['Packaging', 'UseConfigure', 'DoNotBuildTests'] - Configure arguments: '-opensource -confirm-license -nomake examples -nomake tests -accessibility -no-icu -static -release -no-sql-sqlite -openssl-linked -static-runtime OPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}' - Environment variables: ['TARGET_ARCHITECTURE=x86_64', 'PATH=%PATH%;%CI_JOM_PATH%;C:\Utils\gnuwin32\bin;', 'LLVM_INSTALL_DIR=', 'LLVM_INSTALL_DIR_msvc=', 'QDOC_USE_STATIC_LIBCLANG=', 'INCLUDE={{.Env.ZLIB}};{{.Env.XZ}}\src\liblzma\api;{{.Env.BZIP2}};{{.Env.INCLUDE}}', 'LIB={{.Env.ZLIB}};{{.Env.XZ}}\windows\vs2019\ReleaseMT\x64\liblzma{{.Env.BZIP2}};{{.Env.LIB}}'] + Configure arguments: '-opensource -confirm-license -nomake examples -nomake tests -accessibility -no-icu -static -release -no-sql-sqlite -openssl-linked -static-runtime' + Environment variables: [ + 'TARGET_ARCHITECTURE=x86_64', + 'PATH=%PATH%;%CI_JOM_PATH%;C:\Utils\gnuwin32\bin;', + 'LLVM_INSTALL_DIR=', + 'LLVM_INSTALL_DIR_msvc=', + 'QDOC_USE_STATIC_LIBCLANG=', + 'INCLUDE={{.Env.ZLIB}};{{.Env.XZ}}\src\liblzma\api;{{.Env.BZIP2}};{{.Env.INCLUDE}}', + 'LIB={{.Env.ZLIB}};{{.Env.XZ}}\windows\vs2019\ReleaseMT\x64\liblzma{{.Env.BZIP2}};{{.Env.LIB}}', + 'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DOPENSSL_USE_STATIC_LIBS=TRUE -DOPENSSL_MSVC_STATIC_RT=TRUE', + 'NON_QTBASE_CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DOPENSSL_USE_STATIC_LIBS=TRUE -DOPENSSL_MSVC_STATIC_RT=TRUE', + ] Environment script: ['%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64'] - Template: 'qtci-macos-12-x86_64-105' diff --git a/coin/platform_configs/tqtc-installer-framework.yaml b/coin/platform_configs/tqtc-installer-framework.yaml index ffa04628..823d1ba8 100644 --- a/coin/platform_configs/tqtc-installer-framework.yaml +++ b/coin/platform_configs/tqtc-installer-framework.yaml @@ -7,8 +7,18 @@ Configurations: Compiler: 'MSVC2019' Target arch: 'x86_64' Features: ['Packaging', 'QtInstaller', 'UseConfigure', 'DoNotBuildTests'] - Configure arguments: '-opensource -confirm-license -nomake examples -nomake tests -accessibility -no-icu -static -no-sql-sqlite -openssl-linked -static-runtime OPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}' - Environment variables: ['TARGET_ARCHITECTURE=x86_64', 'PATH=%PATH%;%CI_JOM_PATH%;C:\Utils\gnuwin32\bin;', 'LLVM_INSTALL_DIR=', 'LLVM_INSTALL_DIR_msvc=', 'QDOC_USE_STATIC_LIBCLANG='] + Configure arguments: '-opensource -confirm-license -nomake examples -nomake tests -accessibility -no-icu -static -release -no-sql-sqlite -openssl-linked -static-runtime' + Environment variables: [ + 'TARGET_ARCHITECTURE=x86_64', + 'PATH=%PATH%;%CI_JOM_PATH%;C:\Utils\gnuwin32\bin;', + 'LLVM_INSTALL_DIR=', + 'LLVM_INSTALL_DIR_msvc=', + 'QDOC_USE_STATIC_LIBCLANG=', + 'INCLUDE={{.Env.ZLIB}};{{.Env.XZ}}\src\liblzma\api;{{.Env.BZIP2}};{{.Env.INCLUDE}}', + 'LIB={{.Env.ZLIB}};{{.Env.XZ}}\windows\vs2019\ReleaseMT\x64\liblzma{{.Env.BZIP2}};{{.Env.LIB}}', + 'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DOPENSSL_USE_STATIC_LIBS=TRUE -DOPENSSL_MSVC_STATIC_RT=TRUE', + 'NON_QTBASE_CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DOPENSSL_USE_STATIC_LIBS=TRUE -DOPENSSL_MSVC_STATIC_RT=TRUE', + ] Environment script: ['%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64'] - Template: 'qtci-macos-12-x86_64-106' |