|
70 | 70 | }, |
71 | 71 | "environment": { |
72 | 72 | "LINUX_QT_ROOT_DIR": "$env{HOME}/Qt", |
73 | | - "LINUX_PRE_BUILT_DEPS_ROOT_DIR":"$env{HOME}/hyperion_prebuild_deps" |
| 73 | + "LINUX_PRE_BUILT_DEPS_ROOT_DIR": "$env{HOME}/hyperion_prebuild_deps" |
74 | 74 | } |
75 | 75 | }, |
76 | 76 | { |
|
83 | 83 | "rhs": "Linux" |
84 | 84 | }, |
85 | 85 | "cacheVariables": { |
86 | | - "USE_PRE_BUILT_DEPS":"ON", |
87 | | - "PRE_BUILT_DEPS_DIR":"$env{LINUX_PRE_BUILT_DEPS_ROOT_DIR}/qt5" |
| 86 | + "USE_PRE_BUILT_DEPS": "ON", |
| 87 | + "PRE_BUILT_DEPS_DIR": "$env{LINUX_PRE_BUILT_DEPS_ROOT_DIR}/qt5" |
88 | 88 | }, |
89 | 89 | "environment": { |
90 | 90 | } |
|
99 | 99 | "rhs": "Linux" |
100 | 100 | }, |
101 | 101 | "cacheVariables": { |
102 | | - "USE_PRE_BUILT_DEPS":"ON", |
103 | | - "PRE_BUILT_DEPS_DIR":"$env{LINUX_PRE_BUILT_DEPS_ROOT_DIR}/qt6" |
| 102 | + "USE_PRE_BUILT_DEPS": "ON", |
| 103 | + "PRE_BUILT_DEPS_DIR": "$env{LINUX_PRE_BUILT_DEPS_ROOT_DIR}/qt6" |
104 | 104 | }, |
105 | 105 | "environment": { |
106 | 106 | "QTDIR": "$env{LINUX_QT_ROOT_DIR}/6.9.0/gcc_64" |
|
218 | 218 | "name": "release-qt6-all-linux", |
219 | 219 | "inherits": [ "linux-release", "qt6-env-linux-wrapper" ] |
220 | 220 | } |
| 221 | + ], |
| 222 | + "buildPresets": [ |
| 223 | + { |
| 224 | + "name": "package-qt5-all-windows", |
| 225 | + "displayName": "Windows (package - Qt5)", |
| 226 | + "configuration": "Release", |
| 227 | + "targets": [ "package" ], |
| 228 | + "configurePreset": "release-qt5-all-windows", |
| 229 | + "condition": { |
| 230 | + "type": "equals", |
| 231 | + "lhs": "${hostSystemName}", |
| 232 | + "rhs": "Windows" |
| 233 | + } |
| 234 | + }, |
| 235 | + { |
| 236 | + "name": "package-qt6-all-windows", |
| 237 | + "displayName": "Windows (package - Qt6)", |
| 238 | + "configuration": "Release", |
| 239 | + "targets": [ "package" ], |
| 240 | + "configurePreset": "release-qt6-all-windows", |
| 241 | + "condition": { |
| 242 | + "type": "equals", |
| 243 | + "lhs": "${hostSystemName}", |
| 244 | + "rhs": "Windows" |
| 245 | + } |
| 246 | + } |
221 | 247 | ] |
222 | 248 | } |
223 | | - |
|
0 commit comments