File tree 4 files changed +18
-12
lines changed
4 files changed +18
-12
lines changed Original file line number Diff line number Diff line change @@ -276,7 +276,10 @@ jobs:
276
276
277
277
- name : Configure CMake
278
278
shell : bash
279
- run : cmake . -DCMAKE_BUILD_TYPE=Release -Bbuild -DCMAKE_PROJECT_TOP_LEVEL_INCLUDES="cmake/conan_provider.cmake" $CMAKE_EXTRA
279
+ run : |
280
+ cmake . -DCMAKE_BUILD_TYPE=Release -Bbuild \
281
+ -DCONAN_INSTALL_ARGS="-o '&:qt_source=${{matrix.qt_source}}' -b missing" \
282
+ -DCMAKE_PROJECT_TOP_LEVEL_INCLUDES="cmake/conan_provider.cmake" $CMAKE_EXTRA
280
283
281
284
- name : Upload dependency source backups
282
285
shell : bash
Original file line number Diff line number Diff line change @@ -195,16 +195,12 @@ jobs:
195
195
uses : ./.github/actions/setup-conan
196
196
197
197
- name : Configure CMake
198
- if : startsWith(matrix.os, 'Windows') == false
199
198
shell : bash
200
- # This syntax requires CMake 3.23
201
- run : cmake . -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -Bbuild -DCMAKE_PROJECT_TOP_LEVEL_INCLUDES="cmake/conan_provider.cmake" -DCLIENT_ONLY:BOOLEAN=$CLIENT_ONLY -DBYPASS_SIGNING:BOOLEAN=TRUE $CMAKE_EXTRA
202
-
203
- - name : Configure CMake (Windows)
204
- if : startsWith(matrix.os, 'Windows')
205
- shell : bash
206
- # This syntax requires CMake 3.23
207
- run : cmake . -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -Bbuild -DCMAKE_PROJECT_TOP_LEVEL_INCLUDES="cmake/conan_provider.cmake" -DCLIENT_ONLY:BOOLEAN=$CLIENT_ONLY -DBYPASS_SIGNING:BOOLEAN=TRUE $CMAKE_EXTRA
199
+ run : |
200
+ cmake . -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -Bbuild \
201
+ -DCONAN_INSTALL_ARGS="-o '&:qt_source=${{matrix.qt_source}}' -b missing" \
202
+ -DCMAKE_PROJECT_TOP_LEVEL_INCLUDES="cmake/conan_provider.cmake" \
203
+ -DCLIENT_ONLY:BOOLEAN=$CLIENT_ONLY -DBYPASS_SIGNING:BOOLEAN=TRUE $CMAKE_EXTRA
208
204
209
205
- name : Upload dependency source backups
210
206
shell : bash
Original file line number Diff line number Diff line change @@ -232,7 +232,9 @@ jobs:
232
232
- name : Configure CMake
233
233
shell : bash
234
234
run : |
235
- cmake . -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -Bbuild -DCMAKE_PROJECT_TOP_LEVEL_INCLUDES="cmake/conan_provider.cmake" $CMAKE_EXTRA
235
+ cmake . -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -Bbuild \
236
+ -DCONAN_INSTALL_ARGS="-o '&:qt_source=${{matrix.qt_source}}' -b missing" \
237
+ -DCMAKE_PROJECT_TOP_LEVEL_INCLUDES="cmake/conan_provider.cmake" $CMAKE_EXTRA
236
238
237
239
- name : Upload dependency source backups
238
240
shell : bash
Original file line number Diff line number Diff line change @@ -111,7 +111,12 @@ jobs:
111
111
112
112
- name : Configure CMake
113
113
shell : bash
114
- run : cmake . -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -Bbuild -DCMAKE_PROJECT_TOP_LEVEL_INCLUDES="cmake/conan_provider.cmake" -DJSDOC_ENABLED:BOOL=TRUE -DCLIENT_ONLY:BOOLEAN=$CLIENT_ONLY -DBYPASS_SIGNING:BOOLEAN=TRUE $CMAKE_EXTRA
114
+ run : |
115
+ cmake . -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -Bbuild \
116
+ -DCONAN_INSTALL_ARGS="-o '&:qt_source=${{matrix.qt_source}}' -b missing" \
117
+ -DCMAKE_PROJECT_TOP_LEVEL_INCLUDES="cmake/conan_provider.cmake" \
118
+ -DJSDOC_ENABLED:BOOL=TRUE -DCLIENT_ONLY:BOOLEAN=$CLIENT_ONLY \
119
+ -DBYPASS_SIGNING:BOOLEAN=TRUE $CMAKE_EXTRA
115
120
116
121
- name : Cleanup Conan dependencies
117
122
run : conan cache clean "*" -sbd
You can’t perform that action at this time.
0 commit comments