lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-21 12:26:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

IFW: Fix cmake args for static building on Windows

Browse Source 
Task-number: QTIFW-3158
Change-Id: Ifd8a179e65b758089c2274fdf887d6f4f041afcb
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
This commit is contained in:
Simo Fält
2023-09-19 09:01:25 +03:00
parent f3b2983537
commit 703af6a36f
2 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,8 +6,18 @@ Configurations:
Compiler: 'MSVC2019' Compiler: 'MSVC2019'
Target arch: 'x86_64' Target arch: 'x86_64'
Features: ['Packaging', 'UseConfigure', 'DoNotBuildTests'] 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}}' 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}}'] 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'] Environment script: ['%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64']
- -
Template: 'qtci-macos-12-x86_64-105' Template: 'qtci-macos-12-x86_64-105'

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

@@ -7,8 +7,18 @@ Configurations:
Compiler: 'MSVC2019' Compiler: 'MSVC2019'
Target arch: 'x86_64' Target arch: 'x86_64'
Features: ['Packaging', 'QtInstaller', 'UseConfigure', 'DoNotBuildTests'] 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}}' 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='] 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'] Environment script: ['%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64']
- -
Template: 'qtci-macos-12-x86_64-106' Template: 'qtci-macos-12-x86_64-106'