Skip to content

Commit 1d7b46e

Browse files
committed
fix
1 parent 84d5c3d commit 1d7b46e

File tree

4 files changed

+18
-12
lines changed

4 files changed

+18
-12
lines changed

.github/workflows/linux_server_build.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,10 @@ jobs:
276276

277277
- name: Configure CMake
278278
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
280283
281284
- name: Upload dependency source backups
282285
shell: bash

.github/workflows/master_build.yml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -195,16 +195,12 @@ jobs:
195195
uses: ./.github/actions/setup-conan
196196

197197
- name: Configure CMake
198-
if: startsWith(matrix.os, 'Windows') == false
199198
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
208204
209205
- name: Upload dependency source backups
210206
shell: bash

.github/workflows/pr_build.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,9 @@ jobs:
232232
- name: Configure CMake
233233
shell: bash
234234
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
236238
237239
- name: Upload dependency source backups
238240
shell: bash

.github/workflows/release_build.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,12 @@ jobs:
111111

112112
- name: Configure CMake
113113
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
115120
116121
- name: Cleanup Conan dependencies
117122
run: conan cache clean "*" -sbd

0 commit comments

Comments
 (0)