@@ -121,19 +121,18 @@ jobs:
121121 COMMON_CXX_STANDARD : ${{matrix.cpp}}
122122 COMMS_TAG : ${{env.COMMS_TAG}}
123123 COMMSDSL_TAG : ${{env.COMMSDSL_TAG}}
124- CC_TOOLS_QT_TAG : ${{env.CC_TOOLS_QT_TAG}}
124+ CC_TOOLS_QT_SKIP : 1
125125
126126 - name : Configure CMake
127127 shell : bash
128128 working-directory : ${{runner.workspace}}/build
129129 run : |
130130 cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{matrix.type}} -DCMAKE_INSTALL_PREFIX=install \
131131 -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
133133 env :
134134 CC : gcc-${{matrix.cc_ver}}
135135 CXX : g++-${{matrix.cc_ver}}
136- BUILD_TOOLS : " ${{ matrix.cpp >= 17 && 'ON' || 'OFF' }}"
137136
138137 - name : Build Target
139138 working-directory : ${{runner.workspace}}/build
@@ -313,20 +312,18 @@ jobs:
313312 COMMON_CXX_STANDARD : ${{matrix.cpp}}
314313 COMMS_TAG : ${{env.COMMS_TAG}}
315314 COMMSDSL_TAG : ${{env.COMMSDSL_TAG}}
316- CC_TOOLS_QT_TAG : ${{env.CC_TOOLS_QT_TAG}}
315+ CC_TOOLS_QT_SKIP : 1
317316
318317 - name : Configure CMake
319318 shell : bash
320319 working-directory : ${{runner.workspace}}/build
321320 run : |
322321 cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{matrix.type}} -DCMAKE_INSTALL_PREFIX=install \
323322 -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
326324 env :
327325 CC : clang-${{matrix.cc_ver}}
328326 CXX : clang++-${{matrix.cc_ver}}
329- BUILD_TOOLS : " ${{ matrix.cpp >= 17 && 'ON' || 'OFF' }}"
330327
331328 - name : Build Target
332329 working-directory : ${{runner.workspace}}/build
@@ -374,20 +371,18 @@ jobs:
374371 COMMON_CXX_STANDARD : ${{matrix.cpp}}
375372 COMMS_TAG : ${{env.COMMS_TAG}}
376373 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
379375
380376 - name : Configure CMake
381377 shell : bash
382378 working-directory : ${{runner.workspace}}/build
383379 run : |
384380 cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{matrix.type}} -DCMAKE_INSTALL_PREFIX=install \
385381 -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
387383 env :
388384 CC : clang-${{matrix.cc_ver}}
389385 CXX : clang++-${{matrix.cc_ver}}
390- BUILD_TOOLS : " ${{ matrix.cpp == 17 && 'ON' || 'OFF' }}"
391386
392387 - name : Build Target
393388 working-directory : ${{runner.workspace}}/build
0 commit comments