mirror of https://github.com/qt/qt5.git
CMake: Remove superfluous host configure arguments on target configs
Now that we reuse host artifacts, there's no point in specifying host configure arguments on target configurations, they aren't used. Remove them to avoid confusion. Change-Id: I176fe421bc36772cb29929c082ea76946210f98b Reviewed-by: Toni Saario <toni.saario@qt.io>
This commit is contained in:
parent
a87493aede
commit
4da335cfda
|
@ -46,7 +46,7 @@ Configurations:
|
|||
Target compiler: 'Clang'
|
||||
Platform dependency: 'RHEL-7.6-host'
|
||||
Features: ['Packaging', 'Sccache']
|
||||
Environment variables: ['TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -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}}', 'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', 'NON_QTBASE_TARGET_CONFIGURE_ARGS=']
|
||||
Environment variables: ['TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -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}}', 'NON_QTBASE_TARGET_CONFIGURE_ARGS=']
|
||||
-
|
||||
Template: 'qtci-macos-10.14-x86_64'
|
||||
Target os: 'IOS_ANY'
|
||||
|
@ -55,7 +55,7 @@ Configurations:
|
|||
Target compiler: 'Clang'
|
||||
Platform dependency: 'macos-10.14-host'
|
||||
Features: ['Packaging', 'Sccache']
|
||||
Environment variables: ['TARGET_CONFIGURE_ARGS=-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DQT_FORCE_SIMULATOR_AND_DEVICE=ON -DBUILD_WITH_PCH=OFF', 'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', 'NON_QTBASE_TARGET_CONFIGURE_ARGS=']
|
||||
Environment variables: ['TARGET_CONFIGURE_ARGS=-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DQT_FORCE_SIMULATOR_AND_DEVICE=ON -DBUILD_WITH_PCH=OFF', 'NON_QTBASE_TARGET_CONFIGURE_ARGS=']
|
||||
-
|
||||
Template: 'qtci-windows-10-x86_64-51'
|
||||
Compiler: 'Mingw'
|
||||
|
|
Loading…
Reference in New Issue