summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2020-06-15 15:24:03 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2020-06-17 15:44:17 +0200
commit4a0429a82f83118707229fd7f9e089d397d21c6c (patch)
tree04da53a82a65c97a31aa68664171769a3dd5497c
parentb5ab804efd78916fdc29af778c2ee715e3973de3 (diff)
CMake: Use CMake configurations as packaging ones
Remove the "Packaging" feature from the qmake configurations in qt5.yaml and default.yaml. Note that "Packaging" configurations in other .yaml files are not touched yet, because there are no CMake ports for those. These are qdb.yaml, qtwebkit.yaml. qtwebengine.yaml, etc. Assign the "Packaging" feature to the closest equivalent CMake configurations we have. MinGW is not tagged with Packaging for now, because a decision needs to be made what will the Windows7 32 bit configuration be replaced with. At the moment, not every qmake configuration will have an equivalent CMake configuraiton. As a result WebAssembly goes away as a Packaging configuration for Qt 6.0. Task-number: QTBUG-85047 Change-Id: I09b6956b6b9c7393b5e095f826d72e92b81594d0 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
-rw-r--r--coin/platform_configs/cmake_platforms.yaml5
-rw-r--r--coin/platform_configs/default.yaml12
-rw-r--r--coin/platform_configs/qt5.yaml6
3 files changed, 14 insertions, 9 deletions
diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml
index 4664067b..9a7337b7 100644
--- a/coin/platform_configs/cmake_platforms.yaml
+++ b/coin/platform_configs/cmake_platforms.yaml
@@ -11,14 +11,17 @@ Configurations:
-
Template: 'qtci-macos-10.14-x86_64'
Compiler: 'Clang'
+ Features: ['Packaging']
Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_framework=ON -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl'
-
Template: 'qtci-windows-10-x86_64-15'
Compiler: 'MSVC2019'
+ Features: ['Packaging']
Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DBUILD_EXAMPLES=OFF -DBUILD_WITH_PCH=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF'
-
Template: 'qtci-linux-RHEL-7.6-x86_64'
Compiler: 'GCC'
+ Features: ['Packaging']
Configure arguments: '-DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}} -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DFEATURE_system_jpeg=OFF -DFEATURE_system_png=OFF -DFEATURE_system_pcre2=OFF -DFEATURE_system_harfbuzz=OFF -DFEATURE_system_doubleconversion=OFF -DFEATURE_libudev=OFF'
-
Template: 'qtci-linux-RHEL-7.6-x86_64'
@@ -26,6 +29,7 @@ Configurations:
Target arch: 'arm64'
Compiler: 'GCC'
Target compiler: 'Clang'
+ Features: ['Packaging']
Configure arguments: '-DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}} -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DFEATURE_system_jpeg=OFF -DFEATURE_system_png=OFF -DFEATURE_system_pcre2=OFF -DFEATURE_system_harfbuzz=OFF -DFEATURE_system_doubleconversion=OFF -DFEATURE_libudev=OFF'
Environment variables: ['TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=arm64-v8a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}']
-
@@ -34,6 +38,7 @@ Configurations:
Target arch: 'arm64'
Compiler: 'Clang'
Target compiler: 'Clang'
+ Features: ['Packaging']
Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl'
Environment variables: ['TARGET_CONFIGURE_ARGS=-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DQT_FORCE_SIMULATOR_AND_DEVICE=ON']
-
diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml
index 9a55bc1b..b527e692 100644
--- a/coin/platform_configs/default.yaml
+++ b/coin/platform_configs/default.yaml
@@ -9,7 +9,7 @@ Configurations:
-
Template: 'qtci-windows-10-x86_64-17'
Compiler: 'MSVC2019'
- Features: ['Packaging', 'UseLegacyInstructions']
+ Features: ['UseLegacyInstructions']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -headersclean -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -qt-zlib'
-
Template: 'qtci-linux-Ubuntu-18.04-x86_64'
@@ -25,7 +25,7 @@ Configurations:
Template: 'qtci-linux-openSUSE-15.1-x86_64'
Target os: 'WebAssembly'
Compiler: 'GCC'
- Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions']
+ Features: ['DisableTests', 'UseLegacyInstructions']
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -release -static -nomake tests -nomake examples -no-sql-mysql -no-pch -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -no-feature-thread -xplatform wasm-emscripten'
-
Template: 'qtci-linux-SLES-15-x86_64'
@@ -35,12 +35,12 @@ Configurations:
-
Template: 'qtci-linux-RHEL-7.6-x86_64'
Compiler: 'GCC'
- Features: ['Packaging', 'UseLegacyInstructions']
+ Features: ['UseLegacyInstructions']
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -headersclean -force-debug-info -separate-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -xcb -bundled-xcb-xinput -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib QMAKE_LFLAGS_APP+=-s'
-
Template: 'qtci-macos-10.14-x86_64'
Compiler: 'Clang'
- Features: ['Packaging', 'UseLegacyInstructions']
+ Features: ['UseLegacyInstructions']
Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -headersclean -separate-debug-info -nomake tests -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include'
-
Template: 'qtci-macos-10.14-x86_64'
@@ -52,7 +52,7 @@ Configurations:
Target os: 'IOS_ANY'
Target arch: 'multi'
Compiler: 'Clang'
- Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions']
+ Features: ['DisableTests', 'UseLegacyInstructions']
Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -no-icu -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -static -xplatform macx-ios-clang'
-
Template: 'qtci-linux-RHEL-7.6-x86_64'
@@ -60,7 +60,7 @@ Configurations:
Target arch: 'multi'
Compiler: 'GCC'
Target compiler: 'Clang'
- Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions']
+ Features: ['DisableTests', 'UseLegacyInstructions']
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-use-gold-linker -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r20 -android-ndk-host linux-x86_64'
-
Template: 'qtci-linux-Ubuntu-18.04-x86_64'
diff --git a/coin/platform_configs/qt5.yaml b/coin/platform_configs/qt5.yaml
index debefe83..49b6b392 100644
--- a/coin/platform_configs/qt5.yaml
+++ b/coin/platform_configs/qt5.yaml
@@ -5,13 +5,13 @@ Configurations:
Template: 'qtci-windows-7-x86-3'
Compiler: 'Mingw'
Environment variables: ['PATH=C:\MINGW810_i686\mingw32\bin;$PATH']
- Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions']
+ Features: ['DisableTests', 'UseLegacyInstructions']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -separate-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ QMAKE_LFLAGS_APP+=-s -qt-zlib'
-
Template: 'qtci-windows-10-x86_64-17'
Compiler: 'Mingw'
Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH']
- Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions']
+ Features: ['DisableTests', 'UseLegacyInstructions']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -separate-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++ QMAKE_LFLAGS_APP+=-s -qt-zlib'
-
Template: 'qtci-windows-10-x86_64-17'
@@ -20,5 +20,5 @@ Configurations:
Compiler: 'Mingw'
Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH']
Target compiler: 'Clang'
- Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions']
+ Features: ['DisableTests', 'UseLegacyInstructions']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r20'