From 3ed21fda1a2ea6963d9e4cf750e71c7c6bfd4365 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Thu, 20 Jul 2023 18:18:51 +0200 Subject: [PATCH] CMake: Remove feature workarounds now that we ignore strawberry perl Now that we ignore the libraries shipped within the strawberry perl distribution, we can remove the explicit FEATURE_system_foo flags because we'll default to using the qt provided libraries by default. Pick-to: 6.5 6.6 Task-number: QTBUG-113726 Change-Id: I0ef7ae2afd489107a4d5b2c4f859e1e3590ca5e9 Reviewed-by: Alexey Edelev --- coin/platform_configs/cmake_platforms.yaml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 5e3498ae..ff15b79a 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -214,11 +214,11 @@ Configurations: Template: 'qtci-windows-10_22H2-x86_64-51' Compiler: 'Mingw' Features: ['Packaging', 'Sccache', 'UseConfigure'] - Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples -qt-zlib -qt-freetype -qt-libjpeg' + Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples' Environment variables: [ 'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}', 'CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\.. -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c', - 'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}} -DFEATURE_native_grpc=OFF -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c', + 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}} -DFEATURE_native_grpc=OFF -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c', 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}', 'Protobuf_ROOT={{.Env.Protobuf_ROOT_mingw}}', 'gRPC_ROOT={{.Env.gRPC_ROOT_mingw}}', @@ -228,11 +228,11 @@ Configurations: Template: 'qtci-windows-10_22H2-x86_64-51' Compiler: 'Clang' Features: ['Sccache', 'UseConfigure'] - Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples -qt-zlib -qt-freetype -qt-libjpeg' + Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples' Environment variables: [ 'Path=C:\llvm-mingw\bin;{{.Env.Path}}', 'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\.. -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c', - 'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_LLVM_MINGW}} -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c', + 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_LLVM_MINGW}} -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c', 'LLVM_INSTALL_DIR=C:\llvm-mingw', 'Protobuf_ROOT={{.Env.Protobuf_ROOT_llvm_mingw}}', 'gRPC_ROOT={{.Env.gRPC_ROOT_llvm_mingw}}', @@ -242,11 +242,11 @@ Configurations: Template: 'qtci-windows-11_22H2-x86_64-51' Compiler: 'Clang' Features: ['Sccache', 'UseConfigure'] - Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples -qt-zlib -qt-freetype -qt-libjpeg' + Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples' Environment variables: [ 'Path=C:\llvm-mingw\bin;{{.Env.Path}}', 'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\.. -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c', - 'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_LLVM_MINGW}} -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c', + 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_LLVM_MINGW}} -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c', 'LLVM_INSTALL_DIR=C:\llvm-mingw', 'Protobuf_ROOT={{.Env.Protobuf_ROOT_llvm_mingw}}', 'gRPC_ROOT={{.Env.gRPC_ROOT_llvm_mingw}}', @@ -256,11 +256,11 @@ Configurations: Template: 'qtci-windows-10_22H2-x86_64-51' Compiler: 'Mingw' Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure'] - Configure arguments: '-developer-build -release -force-debug-info -separate-debug-info -make examples -qt-zlib -qt-freetype -qt-libjpeg' + Configure arguments: '-developer-build -release -force-debug-info -separate-debug-info -make examples' Environment variables: [ 'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}', 'CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c', - 'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}} -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c', + 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}} -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c', 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}', 'Protobuf_ROOT={{.Env.Protobuf_ROOT_mingw}}', 'gRPC_ROOT={{.Env.gRPC_ROOT_mingw}}', @@ -270,11 +270,11 @@ Configurations: Template: 'qtci-windows-11_22H2-x86_64-51' Compiler: 'Mingw' Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure'] - Configure arguments: '-developer-build -release -force-debug-info -separate-debug-info -make examples -qt-zlib -qt-freetype -qt-libjpeg' + Configure arguments: '-developer-build -release -force-debug-info -separate-debug-info -make examples' Environment variables: [ 'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}', 'CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c', - 'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}} -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c', + 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}} -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c', 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}', 'Protobuf_ROOT={{.Env.Protobuf_ROOT_mingw}}', 'gRPC_ROOT={{.Env.gRPC_ROOT_mingw}}',