Skip to content

Commit 04b9f5a

Browse files
arobenkoarobenko
committed
Release v3.0.6
2 parents ec02b8e + a7a05b6 commit 04b9f5a

9 files changed

Lines changed: 745 additions & 49 deletions

File tree

‎.github/workflows/actions_build.yml‎

Lines changed: 30 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ on:
88
- '**'
99

1010
env:
11-
COMMS_TAG: v5.5
12-
COMMSDSL_TAG: v8.0
13-
CC_TOOLS_QT_TAG: v6.0.6
11+
COMMS_TAG: v5.5.2
12+
COMMSDSL_TAG: v8.1
13+
CC_TOOLS_QT_TAG: v6.0.8
1414
WIN_BOOST_VERSION: "1.87.0"
1515
WIN_BOOST_DIR: "C:/local/boost_1_87_0"
1616

@@ -76,7 +76,7 @@ jobs:
7676
-DDEMO3_TOOLS_QT_VER=${{matrix.qt_ver}} \
7777
-DDEMO3_GEN_PROTOCOL=ON -DDEMO3_GEN_TEST=ON -DDEMO3_GEN_TOOLS=ON -DDEMO3_BUILD_TOOLS=${{env.BUILD_TOOLS}} \
7878
-DDEMO3_GEN_SWIG=ON -DDEMO3_GEN_EMSCRIPTEN=ON -DDEMO3_GEN_C=ON -DDEMO3_GEN_LATEX=ON -DDEMO3_BUILD_LATEX=${{env.BUILD_LATEX}} \
79-
-DDEMO3_BUILD_PROT_DOC=${{env.BUILD_DOCS}}
79+
-DDEMO3_GEN_WIRESHARK=ON -DDEMO3_BUILD_PROT_DOC=${{env.BUILD_DOCS}}
8080
env:
8181
CC: gcc-${{matrix.cc_ver}}
8282
CXX: g++-${{matrix.cc_ver}}
@@ -140,7 +140,8 @@ jobs:
140140
-DCMAKE_PREFIX_PATH=${{runner.workspace}}/build/install -DCMAKE_CXX_STANDARD=${{matrix.cpp}} \
141141
-DDEMO3_TOOLS_QT_VER=${{matrix.qt_ver}} \
142142
-DDEMO3_GEN_PROTOCOL=ON -DDEMO3_GEN_TEST=ON -DDEMO3_GEN_TOOLS=ON -DDEMO3_BUILD_TOOLS=${{env.BUILD_TOOLS}} \
143-
-DDEMO3_GEN_SWIG=ON -DDEMO3_GEN_EMSCRIPTEN=ON -DDEMO3_GEN_C=ON -DDEMO3_GEN_LATEX=ON -DDEMO3_BUILD_LATEX=OFF
143+
-DDEMO3_GEN_SWIG=ON -DDEMO3_GEN_EMSCRIPTEN=ON -DDEMO3_GEN_C=ON -DDEMO3_GEN_LATEX=ON -DDEMO3_BUILD_LATEX=OFF \
144+
-DDEMO3_GEN_WIRESHARK=ON
144145
env:
145146
CC: clang-${{matrix.cc_ver}}
146147
CXX: clang++-${{matrix.cc_ver}}
@@ -159,7 +160,7 @@ jobs:
159160
fail-fast: false
160161
matrix:
161162
type: [Debug, Release, MinSizeRel]
162-
cc_ver: [14, 15, 16, 17, 18]
163+
cc_ver: [14, 15, 16, 17, 18, 19]
163164
cpp: [11, 14, 17, 20, 23]
164165
qt_ver: [5, 6]
165166
exclude:
@@ -215,7 +216,8 @@ jobs:
215216
-DCMAKE_PREFIX_PATH=${{runner.workspace}}/build/install -DCMAKE_CXX_STANDARD=${{matrix.cpp}} \
216217
-DDEMO3_TOOLS_QT_VER=${{matrix.qt_ver}} \
217218
-DDEMO3_GEN_PROTOCOL=ON -DDEMO3_GEN_TEST=ON -DDEMO3_GEN_TOOLS=ON -DDEMO3_BUILD_TOOLS=${{env.BUILD_TOOLS}} \
218-
-DDEMO3_GEN_SWIG=ON -DDEMO3_GEN_EMSCRIPTEN=ON -DDEMO3_GEN_C=ON -DDEMO3_GEN_LATEX=ON -DDEMO3_BUILD_LATEX=OFF
219+
-DDEMO3_GEN_SWIG=ON -DDEMO3_GEN_EMSCRIPTEN=ON -DDEMO3_GEN_C=ON -DDEMO3_GEN_LATEX=ON -DDEMO3_BUILD_LATEX=OFF \
220+
-DDEMO3_GEN_WIRESHARK=ON
219221
env:
220222
CC: clang-${{matrix.cc_ver}}
221223
CXX: clang++-${{matrix.cc_ver}}
@@ -237,27 +239,19 @@ jobs:
237239
arch: [Win32, x64]
238240
cpp: [11, 14, 17, 20]
239241
qt_ver: [5, 6]
240-
exclude:
241-
- arch: Win32
242-
qt_ver: 6
243242

244243
steps:
245244
- uses: actions/checkout@v4
246245

247246
- name: Create Build Environment
248247
run: cmake -E make_directory ${{runner.workspace}}/build
249248

250-
- name: Install Qt
249+
- name: Install Qt (sets QT_ROOT_DIR)
251250
if: ${{matrix.cpp >= 17 && matrix.arch == 'x64'}}
252-
shell: cmd
253-
run: |
254-
choco install curl
255-
curl -L https://github.com/martinrotter/qt-minimalistic-builds/releases/download/${{env.QT_VER}}/qt-${{env.QT_VER}}-dynamic-msvc2019-x86_64.7z -o ${{runner.workspace}}/qt.7z
256-
7z x ${{runner.workspace}}/qt.7z -o${{runner.workspace}}/qt
257-
echo QT_VER=${{env.QT_VER}} >>%GITHUB_ENV%
258-
echo QTDIR=${{runner.workspace}}/qt/qt-${{env.QT_VER}}-dynamic-msvc2019-x86_64 >>%GITHUB_ENV%
259-
env:
260-
QT_VER: ${{matrix.qt_ver == '5' && '5.15.3' || '6.2.2'}}
251+
uses: jurplel/install-qt-action@v4
252+
with:
253+
version: ${{ matrix.qt_ver == 5 && '5.15.*' || '6.8.*' }}
254+
cache: true
261255

262256
- name: Install Boost
263257
if: matrix.arch == 'x64'
@@ -269,6 +263,7 @@ jobs:
269263
- name: Prepare externals
270264
shell: cmd
271265
run: |
266+
set QTDIR=%QT_ROOT_DIR%
272267
%GITHUB_WORKSPACE%\script\prepare_externals.bat
273268
env:
274269
BUILD_DIR: ${{runner.workspace}}/build
@@ -282,21 +277,21 @@ jobs:
282277
COMMSDSL_PLATFORM: 'x64'
283278
CC_TOOLS_QT_TAG: ${{env.CC_TOOLS_QT_TAG}}
284279
CC_TOOLS_QT_MAJOR_QT_VERSION: ${{matrix.qt_ver}}
285-
CC_TOOLS_QT_SKIP: ${{matrix.arch == 'Win32' && '1' || '0'}}
280+
CC_TOOLS_QT_SKIP: ${{ matrix.cpp >= 17 && matrix.arch == 'x64' && (matrix.qt_ver == 6 || matrix.cpp < 20) && '0' || '1' }}
286281

287282
- name: Configure CMake
288283
shell: cmd
289284
working-directory: ${{runner.workspace}}/build
290285
run: |
291286
cmake %GITHUB_WORKSPACE% -A ${{matrix.arch}} -DCMAKE_BUILD_TYPE=${{matrix.type}} -DCMAKE_INSTALL_PREFIX=install ^
292-
-DCMAKE_PREFIX_PATH="${{runner.workspace}}/build/install;${{env.QTDIR}};${{env.BOOST_DIR}}" ^
287+
-DCMAKE_PREFIX_PATH="${{runner.workspace}}/build/install;${{env.QT_ROOT_DIR}};${{env.BOOST_DIR}}" ^
293288
-DCMAKE_POLICY_DEFAULT_CMP0167=NEW ^
294289
-DCMAKE_CXX_STANDARD=${{matrix.cpp}} -DDEMO3_GEN_TOOLS=ON -DDEMO3_BUILD_TOOLS=${{env.BUILD_TOOLS}} -DDEMO3_TOOLS_QT_VER=${{matrix.qt_ver}} ^
295290
-DDEMO3_GEN_PROTOCOL=ON -DDEMO3_GEN_TEST=ON -DDEMO3_GEN_C=ON -DDEMO3_GEN_LATEX=ON -DDEMO3_BUILD_LATEX=OFF ^
296-
-DDEMO3_BUILD_EXAMPLES=${{env.HAS_BOOST}}
291+
-DDEMO3_GEN_WIRESHARK=ON -DDEMO3_BUILD_EXAMPLES=${{env.HAS_BOOST}}
297292
env:
298293
HAS_BOOST: "${{ matrix.arch == 'x64' && 'ON' || 'OFF' }}"
299-
BUILD_TOOLS: "${{ matrix.cpp >= 17 && matrix.arch == 'x64' && 'ON' || 'OFF' }}"
294+
BUILD_TOOLS: "${{ matrix.cpp >= 17 && matrix.arch == 'x64' && (matrix.qt_ver == 6 || matrix.cpp < 20) && 'ON' || 'OFF' }}"
300295

301296
- name: Build Target
302297
working-directory: ${{runner.workspace}}/build
@@ -305,7 +300,7 @@ jobs:
305300
env:
306301
VERBOSE: 1
307302

308-
build_msvc_2025:
303+
build_msvc_2026:
309304
runs-on: windows-2025
310305
strategy:
311306
fail-fast: false
@@ -314,27 +309,19 @@ jobs:
314309
arch: [Win32, x64]
315310
cpp: [11, 14, 17, 20, 23]
316311
qt_ver: [5, 6]
317-
exclude:
318-
- arch: Win32
319-
qt_ver: 6
320312

321313
steps:
322314
- uses: actions/checkout@v4
323315

324316
- name: Create Build Environment
325317
run: cmake -E make_directory ${{runner.workspace}}/build
326318

327-
- name: Install Qt
319+
- name: Install Qt (sets QT_ROOT_DIR)
328320
if: ${{matrix.cpp >= 17 && matrix.arch == 'x64'}}
329-
shell: cmd
330-
run: |
331-
choco install curl
332-
curl -L https://github.com/martinrotter/qt-minimalistic-builds/releases/download/${{env.QT_VER}}/qt-${{env.QT_VER}}-dynamic-msvc2019-x86_64.7z -o ${{runner.workspace}}/qt.7z
333-
7z x ${{runner.workspace}}/qt.7z -o${{runner.workspace}}/qt
334-
echo QT_VER=${{env.QT_VER}} >>%GITHUB_ENV%
335-
echo QTDIR=${{runner.workspace}}/qt/qt-${{env.QT_VER}}-dynamic-msvc2019-x86_64 >>%GITHUB_ENV%
336-
env:
337-
QT_VER: ${{matrix.qt_ver == '5' && '5.15.3' || '6.2.2'}}
321+
uses: jurplel/install-qt-action@v4
322+
with:
323+
version: ${{ matrix.qt_ver == 5 && '5.15.*' || '6.8.*' }}
324+
cache: true
338325

339326
- name: Install Boost
340327
if: matrix.arch == 'x64'
@@ -346,6 +333,7 @@ jobs:
346333
- name: Prepare externals
347334
shell: cmd
348335
run: |
336+
set QTDIR=%QT_ROOT_DIR%
349337
%GITHUB_WORKSPACE%\script\prepare_externals.bat
350338
env:
351339
BUILD_DIR: ${{runner.workspace}}/build
@@ -359,21 +347,21 @@ jobs:
359347
COMMSDSL_PLATFORM: 'x64'
360348
CC_TOOLS_QT_TAG: ${{env.CC_TOOLS_QT_TAG}}
361349
CC_TOOLS_QT_MAJOR_QT_VERSION: ${{matrix.qt_ver}}
362-
CC_TOOLS_QT_SKIP: ${{matrix.arch == 'Win32' && '1' || '0'}}
350+
CC_TOOLS_QT_SKIP: ${{ matrix.cpp >= 17 && matrix.arch == 'x64' && (matrix.qt_ver == 6 || matrix.cpp < 20) && '0' || '1' }}
363351

364352
- name: Configure CMake
365353
shell: cmd
366354
working-directory: ${{runner.workspace}}/build
367355
run: |
368356
cmake %GITHUB_WORKSPACE% -A ${{matrix.arch}} -DCMAKE_BUILD_TYPE=${{matrix.type}} -DCMAKE_INSTALL_PREFIX=install ^
369-
-DCMAKE_PREFIX_PATH="${{runner.workspace}}/build/install;${{env.QTDIR}};${{env.BOOST_DIR}}" ^
357+
-DCMAKE_PREFIX_PATH="${{runner.workspace}}/build/install;${{env.QT_ROOT_DIR}};${{env.BOOST_DIR}}" ^
370358
-DCMAKE_POLICY_DEFAULT_CMP0167=NEW ^
371359
-DCMAKE_CXX_STANDARD=${{matrix.cpp}} -DDEMO3_GEN_TOOLS=ON -DDEMO3_BUILD_TOOLS=${{env.BUILD_TOOLS}} -DDEMO3_TOOLS_QT_VER=${{matrix.qt_ver}} ^
372360
-DDEMO3_GEN_PROTOCOL=ON -DDEMO3_GEN_TEST=ON -DDEMO3_GEN_C=ON -DDEMO3_GEN_LATEX=ON -DDEMO3_BUILD_LATEX=OFF ^
373-
-DDEMO3_BUILD_EXAMPLES=${{env.HAS_BOOST}}
361+
-DDEMO3_GEN_WIRESHARK=ON -DDEMO3_BUILD_EXAMPLES=${{env.HAS_BOOST}}
374362
env:
375363
HAS_BOOST: "${{ matrix.arch == 'x64' && 'ON' || 'OFF' }}"
376-
BUILD_TOOLS: "${{ matrix.cpp >= 17 && matrix.arch == 'x64' && 'ON' || 'OFF' }}"
364+
BUILD_TOOLS: "${{ matrix.cpp >= 17 && matrix.arch == 'x64' && (matrix.qt_ver == 6 || matrix.cpp < 20) && 'ON' || 'OFF' }}"
377365

378366
- name: Build Target
379367
working-directory: ${{runner.workspace}}/build

‎CMakeLists.txt‎

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ option (DEMO3_GEN_C "Use commsdsl2c to generate \"C\" wrappers project." OFF)
1818
option (DEMO3_BUILD_C "Build and install project generated by the commsdsl2c." ${DEMO3_GEN_C})
1919
option (DEMO3_GEN_LATEX "Use commsdsl2latex to generate protocol specification." OFF)
2020
option (DEMO3_BUILD_LATEX "Build and install project generated by the commsdsl2latex." ${DEMO3_GEN_C})
21+
option (DEMO3_GEN_WIRESHARK "Use commsdsl2wireshark to generate wireshark protocol dissector." OFF)
2122
option (DEMO3_BUILD_EXAMPLES "Build examples." ON)
2223

2324
# Additional variables to be used if needed
@@ -32,6 +33,7 @@ option (DEMO3_BUILD_EXAMPLES "Build examples." ON)
3233
# DEMO3_EMSCRIPTEN_OUTPUT_DIR - Path to emscripten output directory. If not provided <build_dir>/output_emscripten one is used.
3334
# DEMO3_C_OUTPUT_DIR - Path to "c" output directory. If not provided <build_dir>/output_c one is used.
3435
# DEMO3_LATEX_OUTPUT_DIR - Path to latex output directory. If not provided <build_dir>/output_latex one is used.
36+
# DEMO3_WIRESHARK_OUTPUT_DIR - Path to wireshark output directory. If not provided <build_dir>/output_wireshark one is used.
3537
# DEMO3_CCACHE_EXECUTABLE - Custom ccache executable
3638
# COMMSDSL2COMMS_EXTRA_ARGS - Extra arguments to pass to "commsdsl2comms"
3739
# COMMSDSL2TEST_EXTRA_ARGS - Extra arguments to pass to "commsdsl2test"
@@ -40,9 +42,10 @@ option (DEMO3_BUILD_EXAMPLES "Build examples." ON)
4042
# COMMSDSL2EMSCRIPTEN_EXTRA_ARGS - Extra arguments to pass to "commsdsl2emscripten"
4143
# COMMSDSL2C_EXTRA_ARGS - Extra arguments to pass to "commsdsl2c"
4244
# COMMSDSL2LATEX_EXTRA_ARGS - Extra arguments to pass to "commsdsl2latex"
45+
# COMMSDSL2WIRESHARK_EXTRA_ARGS - Extra arguments to pass to "commsdsl2wireshark"
4346

44-
set (DEMO3_VERSION "3.0.5")
45-
set (DEMO3_MIN_COMMSDSL_VERSION "8.0")
47+
set (DEMO3_VERSION "3.0.6")
48+
set (DEMO3_MIN_COMMSDSL_VERSION "8.1")
4649

4750
if (("${CMAKE_VERSION}" VERSION_GREATER_EQUAL "3.30") AND
4851
(NOT DEFINED CMAKE_POLICY_DEFAULT_CMP0167))
@@ -96,6 +99,10 @@ if ("${DEMO3_LATEX_OUTPUT_DIR}" STREQUAL "")
9699
set (DEMO3_LATEX_OUTPUT_DIR "${CMAKE_BINARY_DIR}/output_latex")
97100
endif ()
98101

102+
if ("${DEMO3_LATEX_WIRESHARK_DIR}" STREQUAL "")
103+
set (DEMO3_LATEX_WIRESHARK_DIR "${CMAKE_BINARY_DIR}/output_wireshark")
104+
endif ()
105+
99106
if ("${DEMO3_TOOLS_QT_VER}" STREQUAL "")
100107
set (DEMO3_TOOLS_QT_VER 5)
101108
endif ()
@@ -498,6 +505,25 @@ if (DEMO3_GEN_LATEX)
498505
endif ()
499506
endif ()
500507

508+
if (DEMO3_GEN_WIRESHARK)
509+
find_program(COMMSDSL2WIRESHARK commsdsl2wireshark PATH_SUFFIXES bin REQUIRED)
510+
execute_process(COMMAND "${COMMSDSL2WIRESHARK}" --version OUTPUT_VARIABLE commsdsl2wireshark_version)
511+
if ("${commsdsl2wireshark_version}" VERSION_LESS "${DEMO3_MIN_COMMSDSL_VERSION}")
512+
message (FATAL_ERROR "Version of commsdsl2wireshark is too old, required minimum is v${DEMO3_MIN_COMMSDSL_VERSION}.")
513+
endif ()
514+
515+
set (wireshark_tmp_dir "${CMAKE_BINARY_DIR}/output_wireshark.tmp")
516+
517+
add_custom_target("wireshark_output_tgt" ALL
518+
COMMAND ${CMAKE_COMMAND} -E remove_directory ${wireshark_tmp_dir}
519+
COMMAND ${COMMSDSL2WIRESHARK} ${warn_as_error} ${COMMSDSL2WIRESHARK_EXTRA_ARGS}
520+
-o ${wireshark_tmp_dir} -c ${PROJECT_SOURCE_DIR}/src/wireshark ${schema_file}
521+
COMMAND ${CMAKE_COMMAND}
522+
-DGENERATED="${wireshark_tmp_dir}" -DOUTPUT="${DEMO3_LATEX_WIRESHARK_DIR}"
523+
-P "${CMAKE_CURRENT_LIST_DIR}/CopyGenerated.cmake"
524+
DEPENDS "${CMAKE_CURRENT_LIST_DIR}/CopyGenerated.cmake" ${schema_file})
525+
endif ()
526+
501527
if (NOT DEMO3_BUILD_EXAMPLES)
502528
return()
503529
endif()

‎examples/client/Client.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ void Client::processInput()
186186
{
187187
if (!m_inputBuf.empty()) {
188188
auto consumed = comms::processAllWithDispatch(&m_inputBuf[0], m_inputBuf.size(), m_frame, *this);
189-
m_inputBuf.erase(m_inputBuf.begin(), m_inputBuf.begin() + consumed);
189+
m_inputBuf.erase(m_inputBuf.begin(), m_inputBuf.begin() + static_cast<int>(consumed));
190190
}
191191
}
192192

‎examples/server/Session.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ void Session::processInput()
107107
{
108108
if (!m_inputBuf.empty()) {
109109
auto consumed = comms::processAllWithDispatch(&m_inputBuf[0], m_inputBuf.size(), m_frame, *this);
110-
m_inputBuf.erase(m_inputBuf.begin(), m_inputBuf.begin() + consumed);
110+
m_inputBuf.erase(m_inputBuf.begin(), m_inputBuf.begin() + static_cast<int>(consumed));
111111
}
112112
}
113113

‎script/full_debug_build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ cd ${BUILD_DIR}
2020
cmake .. -DCMAKE_INSTALL_PREFIX=${COMMON_INSTALL_DIR} \
2121
-DCMAKE_BUILD_TYPE=Debug -DDEMO3_BUILD_PROT_DOC=ON -DDEMO3_GEN_TEST=ON \
2222
-DDEMO3_GEN_TOOLS=ON -DDEMO3_GEN_SWIG=ON -DDEMO3_GEN_EMSCRIPTEN=ON \
23-
-DDEMO3_GEN_C=ON -DDEMO3_GEN_LATEX=ON \
23+
-DDEMO3_GEN_C=ON -DDEMO3_GEN_LATEX=ON -DDEMO3_GEN_WIRESHARK=ON \
2424
-DDEMO3_USE_CCACHE=ON "$@"
2525

2626
procs=$(nproc)

‎script/prepare_externals.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ cd %COMMSDSL_BUILD_DIR%
108108
cmake %GENERATOR_PARAM% %COMMSDSL_PLATFORM_PARAM% -S %COMMSDSL_SRC_DIR% -B %COMMSDSL_BUILD_DIR% ^
109109
-DCMAKE_INSTALL_PREFIX=%COMMSDSL_INSTALL_DIR% -DCMAKE_BUILD_TYPE=%COMMON_BUILD_TYPE% ^
110110
-DCOMMSDSL_INSTALL_LIBRARY=OFF -DCOMMSDSL_BUILD_COMMSDSL2TEST=ON -DCOMMSDSL_BUILD_COMMSDSL2TOOLS_QT=ON ^
111-
-DCOMMSDSL_BUILD_COMMSDSL2LATEX=ON -DCOMMSDSL_BUILD_COMMSDSL2C=ON
111+
-DCOMMSDSL_BUILD_COMMSDSL2LATEX=ON -DCOMMSDSL_BUILD_COMMSDSL2C=ON -DCOMMSDSL_BUILD_COMMSDSL2WIRESHARK=ON
112112
if %errorlevel% neq 0 exit /b %errorlevel%
113113
cmake --build %COMMSDSL_BUILD_DIR% --config %COMMON_BUILD_TYPE% --target install
114114
if %errorlevel% neq 0 exit /b %errorlevel%

‎script/prepare_externals.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ function build_commsdsl() {
147147
${COMMON_CCACHE_EXECUTABLE:+"-DCOMMSDSL_CCACHE_EXECUTABLE=${COMMON_CCACHE_EXECUTABLE}"} \
148148
-DCOMMSDSL_INSTALL_LIBRARY=OFF -DCOMMSDSL_BUILD_COMMSDSL2TEST=ON -DCOMMSDSL_BUILD_COMMSDSL2TOOLS_QT=ON \
149149
-DCOMMSDSL_BUILD_COMMSDSL2SWIG=ON -DCOMMSDSL_BUILD_COMMSDSL2EMSCRIPTEN=ON \
150-
-DCOMMSDSL_BUILD_COMMSDSL2LATEX=ON -DCOMMSDSL_BUILD_COMMSDSL2C=ON
150+
-DCOMMSDSL_BUILD_COMMSDSL2LATEX=ON -DCOMMSDSL_BUILD_COMMSDSL2C=ON -DCOMMSDSL_BUILD_COMMSDSL2WIRESHARK=ON
151151
cmake --build ${COMMSDSL_BUILD_DIR} --config ${COMMON_BUILD_TYPE} --target install ${procs_param}
152152
}
153153

@@ -181,6 +181,7 @@ function build_cc_tools_qt() {
181181
${COMMON_CCACHE_EXECUTABLE:+"-DCC_TOOLS_QT_CCACHE_EXECUTABLE=${COMMON_CCACHE_EXECUTABLE}"} \
182182
-DCMAKE_BUILD_TYPE=${COMMON_BUILD_TYPE} -DCC_TOOLS_QT_BUILD_APPS=OFF -DCMAKE_PREFIX_PATH=${COMMS_INSTALL_DIR} \
183183
-DCMAKE_CXX_STANDARD=${COMMON_CXX_STANDARD} ${CC_TOOLS_QT_VERSION_OPT}
184+
184185
cmake --build ${CC_TOOLS_QT_BUILD_DIR} --config ${COMMON_BUILD_TYPE} --target install ${procs_param}
185186
}
186187

0 commit comments

Comments
 (0)