@@ -121,19 +121,18 @@ jobs:
121
121
COMMON_CXX_STANDARD : ${{matrix.cpp}}
122
122
COMMS_TAG : ${{env.COMMS_TAG}}
123
123
COMMSDSL_TAG : ${{env.COMMSDSL_TAG}}
124
- CC_TOOLS_QT_TAG : ${{env.CC_TOOLS_QT_TAG}}
124
+ CC_TOOLS_QT_SKIP : 1
125
125
126
126
- name : Configure CMake
127
127
shell : bash
128
128
working-directory : ${{runner.workspace}}/build
129
129
run : |
130
130
cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{matrix.type}} -DCMAKE_INSTALL_PREFIX=install \
131
131
-DCMAKE_PREFIX_PATH=${{runner.workspace}}/build/install -DCMAKE_CXX_STANDARD=${{matrix.cpp}} \
132
- -DMQTTSN_GEN_PROTOCOL=ON -DMQTTSN_GEN_TEST=ON -DMQTTSN_GEN_TOOLS=ON -DMQTTSN_BUILD_TOOLS=${{env.BUILD_TOOLS}}
132
+ -DMQTTSN_GEN_PROTOCOL=ON -DMQTTSN_GEN_TEST=ON
133
133
env :
134
134
CC : gcc-${{matrix.cc_ver}}
135
135
CXX : g++-${{matrix.cc_ver}}
136
- BUILD_TOOLS : " ${{ matrix.cpp >= 17 && 'ON' || 'OFF' }}"
137
136
138
137
- name : Build Target
139
138
working-directory : ${{runner.workspace}}/build
@@ -313,20 +312,18 @@ jobs:
313
312
COMMON_CXX_STANDARD : ${{matrix.cpp}}
314
313
COMMS_TAG : ${{env.COMMS_TAG}}
315
314
COMMSDSL_TAG : ${{env.COMMSDSL_TAG}}
316
- CC_TOOLS_QT_TAG : ${{env.CC_TOOLS_QT_TAG}}
315
+ CC_TOOLS_QT_SKIP : 1
317
316
318
317
- name : Configure CMake
319
318
shell : bash
320
319
working-directory : ${{runner.workspace}}/build
321
320
run : |
322
321
cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{matrix.type}} -DCMAKE_INSTALL_PREFIX=install \
323
322
-DCMAKE_EXE_LINKER_FLAGS=-fuse-ld=gold -DCMAKE_PREFIX_PATH=${{runner.workspace}}/build/install \
324
- -DCMAKE_CXX_STANDARD=${{matrix.cpp}} -DMQTTSN_GEN_PROTOCOL=ON -DMQTTSN_GEN_TEST=ON \
325
- -DMQTTSN_GEN_TOOLS=ON -DMQTTSN_BUILD_TOOLS=${{env.BUILD_TOOLS}}
323
+ -DCMAKE_CXX_STANDARD=${{matrix.cpp}} -DMQTTSN_GEN_PROTOCOL=ON -DMQTTSN_GEN_TEST=ON
326
324
env :
327
325
CC : clang-${{matrix.cc_ver}}
328
326
CXX : clang++-${{matrix.cc_ver}}
329
- BUILD_TOOLS : " ${{ matrix.cpp >= 17 && 'ON' || 'OFF' }}"
330
327
331
328
- name : Build Target
332
329
working-directory : ${{runner.workspace}}/build
@@ -374,20 +371,18 @@ jobs:
374
371
COMMON_CXX_STANDARD : ${{matrix.cpp}}
375
372
COMMS_TAG : ${{env.COMMS_TAG}}
376
373
COMMSDSL_TAG : ${{env.COMMSDSL_TAG}}
377
- CC_TOOLS_QT_TAG : ${{env.CC_TOOLS_QT_TAG}}
378
- CC_TOOLS_QT_SKIP : " ${{ matrix.cpp < 17 && '1' || '0' }}"
374
+ CC_TOOLS_QT_SKIP : 1
379
375
380
376
- name : Configure CMake
381
377
shell : bash
382
378
working-directory : ${{runner.workspace}}/build
383
379
run : |
384
380
cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{matrix.type}} -DCMAKE_INSTALL_PREFIX=install \
385
381
-DCMAKE_PREFIX_PATH=${{runner.workspace}}/build/install -DCMAKE_CXX_STANDARD=${{matrix.cpp}} \
386
- -DMQTTSN_GEN_PROTOCOL=ON -DMQTTSN_GEN_TEST=ON -DMQTTSN_GEN_TOOLS=ON -DMQTTSN_BUILD_TOOLS=${{env.BUILD_TOOLS}}
382
+ -DMQTTSN_GEN_PROTOCOL=ON -DMQTTSN_GEN_TEST=ON
387
383
env :
388
384
CC : clang-${{matrix.cc_ver}}
389
385
CXX : clang++-${{matrix.cc_ver}}
390
- BUILD_TOOLS : " ${{ matrix.cpp == 17 && 'ON' || 'OFF' }}"
391
386
392
387
- name : Build Target
393
388
working-directory : ${{runner.workspace}}/build
0 commit comments