diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-02-27 17:02:18 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-06 06:25:50 +0100 |
| commit | e1bc1c4885b709b0dee1766019a3562f00994d8f (patch) | |
| tree | dcc3b81300fc178b3202f65d5022101918fd923f /coin/platform_configs/qtsvg.yaml | |
| parent | 2a405a8df3a6acbc905a3242e14a399eea98e512 (diff) | |
Remove vcpkg provisioning and configure arguments
Now that qtbase supports building bundled 3rd party libraries, we
should have no need for vcpkg in Coin anymore.
Change-Id: I7aa7b0323416b60ffb0cd70eec287e5f25963d9a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'coin/platform_configs/qtsvg.yaml')
| -rw-r--r-- | coin/platform_configs/qtsvg.yaml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/coin/platform_configs/qtsvg.yaml b/coin/platform_configs/qtsvg.yaml index a2ac4e29..dc6897dd 100644 --- a/coin/platform_configs/qtsvg.yaml +++ b/coin/platform_configs/qtsvg.yaml @@ -15,7 +15,7 @@ Configurations: - Template: 'qtci-windows-10-x86_64-15' Compiler: 'MSVC2019' - Configure arguments: '-DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake' + Configure arguments: '-DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_EXAMPLES=OFF' - Template: 'qtci-linux-RHEL-7.6-x86_64' Compiler: 'GCC' @@ -27,4 +27,4 @@ Configurations: Compiler: 'GCC' Target compiler: 'Clang' Configure arguments: '-DBUILD_EXAMPLES=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 -DVCPKG_TARGET_TRIPLET=arm64-android -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU'] + 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'] |