Skip to content

Commit ec02b8e

Browse files
arobenkoarobenko
committed
Release v3.0.5
2 parents ae00c1b + 5cc6081 commit ec02b8e

3 files changed

Lines changed: 61 additions & 61 deletions

File tree

‎.github/workflows/actions_build.yml‎

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

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

‎CMakeLists.txt‎

Lines changed: 57 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ option (DEMO3_BUILD_EXAMPLES "Build examples." ON)
4141
# COMMSDSL2C_EXTRA_ARGS - Extra arguments to pass to "commsdsl2c"
4242
# COMMSDSL2LATEX_EXTRA_ARGS - Extra arguments to pass to "commsdsl2latex"
4343

44-
set (DEMO3_VERSION "3.0.4")
45-
set (DEMO3_MIN_COMMSDSL_VERSION "7.3")
44+
set (DEMO3_VERSION "3.0.5")
45+
set (DEMO3_MIN_COMMSDSL_VERSION "8.0")
4646

4747
if (("${CMAKE_VERSION}" VERSION_GREATER_EQUAL "3.30") AND
4848
(NOT DEFINED CMAKE_POLICY_DEFAULT_CMP0167))
@@ -107,7 +107,7 @@ endif ()
107107

108108
include (ExternalProject)
109109
if (DEMO3_GEN_PROTOCOL)
110-
find_program(COMMSDSL2COMMS commsdsl2comms PATH_SUFFIXES bin REQUIRED)
110+
find_program(COMMSDSL2COMMS commsdsl2comms PATH_SUFFIXES bin REQUIRED)
111111
execute_process(COMMAND "${COMMSDSL2COMMS}" --version OUTPUT_VARIABLE commsdsl2comms_version)
112112
if ("${commsdsl2comms_version}" VERSION_LESS "${DEMO3_MIN_COMMSDSL_VERSION}")
113113
message (FATAL_ERROR "Version of commsdsl2comms is too old, required minimum is v${DEMO3_MIN_COMMSDSL_VERSION}.")
@@ -119,7 +119,7 @@ if (DEMO3_GEN_PROTOCOL)
119119
COMMAND ${CMAKE_COMMAND} -E remove_directory ${prot_tmp_dir}
120120
COMMAND ${COMMSDSL2COMMS} ${warn_as_error} -V ${DEMO3_VERSION}
121121
-o ${prot_tmp_dir} -c ${PROJECT_SOURCE_DIR}/src/protocol
122-
${COMMSDSL2COMMS_EXTRA_ARGS} ${schema_file}
122+
${COMMSDSL2COMMS_EXTRA_ARGS} ${schema_file}
123123
COMMAND ${CMAKE_COMMAND}
124124
-DGENERATED="${prot_tmp_dir}" -DOUTPUT="${DEMO3_PROT_OUTPUT_DIR}"
125125
-P "${CMAKE_CURRENT_LIST_DIR}/CopyGenerated.cmake"
@@ -128,7 +128,7 @@ if (DEMO3_GEN_PROTOCOL)
128128
if (DEMO3_BUILD_PROTOCOL)
129129
execute_process(
130130
COMMAND ${CMAKE_COMMAND} -E make_directory ${DEMO3_PROT_OUTPUT_DIR}
131-
)
131+
)
132132

133133
execute_process(
134134
COMMAND ${CMAKE_COMMAND} -E touch ${DEMO3_PROT_OUTPUT_DIR}/dummy.txt
@@ -146,50 +146,50 @@ if (DEMO3_GEN_PROTOCOL)
146146
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
147147
-DCMAKE_GENERATOR=${CMAKE_GENERATOR} -DCMAKE_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM}
148148
-DCMAKE_GENERATOR_TOOLSET=${CMAKE_GENERATOR_TOOLSET} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
149-
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_EXE_LINKER_FLAGS=${CMAKE_EXE_LINKER_FLAGS}
149+
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_EXE_LINKER_FLAGS=${CMAKE_EXE_LINKER_FLAGS}
150150
-DOPT_REQUIRE_COMMS_LIB=OFF -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
151151
-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
152152
)
153153

154154
find_package(Doxygen)
155155
if (DEMO3_BUILD_PROT_DOC AND DOXYGEN_FOUND)
156156
ExternalProject_Add_Step(
157-
"prot_tgt"
157+
"prot_tgt"
158158
"doc"
159159
COMMAND ${CMAKE_COMMAND} --build ${prot_build_dir} --target doc_cc_demo3
160160
DEPENDEES "build"
161161
DEPENDERS "install"
162162
)
163163
endif ()
164164
endif ()
165-
endif ()
165+
endif ()
166166

167167
set (combined_prefix_path ${CMAKE_INSTALL_PREFIX} ${CMAKE_PREFIX_PATH})
168168
string (REPLACE ";" "|" combined_prefix_path_str "${combined_prefix_path}")
169169

170170
if (DEMO3_GEN_TEST)
171-
find_program(COMMSDSL2TEST commsdsl2test PATH_SUFFIXES bin REQUIRED)
171+
find_program(COMMSDSL2TEST commsdsl2test PATH_SUFFIXES bin REQUIRED)
172172
execute_process(COMMAND "${COMMSDSL2TEST}" --version OUTPUT_VARIABLE commsdsl2test_version)
173173
if ("${commsdsl2test_version}" VERSION_LESS "${DEMO3_MIN_COMMSDSL_VERSION}")
174174
message (FATAL_ERROR "Version of commsdsl2test is too old, required minimum is v${DEMO3_MIN_COMMSDSL_VERSION}.")
175-
endif ()
175+
endif ()
176176

177177
set (test_tmp_dir "${CMAKE_BINARY_DIR}/output_test.tmp")
178178

179179
add_custom_target("test_output_tgt" ALL
180180
COMMAND ${CMAKE_COMMAND} -E remove_directory ${test_tmp_dir}
181181
COMMAND ${COMMSDSL2TEST} ${warn_as_error} -V ${DEMO3_VERSION} ${COMMSDSL2TEST_EXTRA_ARGS}
182-
-o ${test_tmp_dir} -c ${PROJECT_SOURCE_DIR}/src/test ${schema_file}
182+
-o ${test_tmp_dir} -c ${PROJECT_SOURCE_DIR}/src/test ${schema_file}
183183
COMMAND ${CMAKE_COMMAND}
184184
-DGENERATED="${test_tmp_dir}" -DOUTPUT="${DEMO3_TEST_OUTPUT_DIR}"
185-
-P "${CMAKE_CURRENT_LIST_DIR}/CopyGenerated.cmake"
185+
-P "${CMAKE_CURRENT_LIST_DIR}/CopyGenerated.cmake"
186186
DEPENDS "${CMAKE_CURRENT_LIST_DIR}/CopyGenerated.cmake" ${schema_file})
187187

188188
if (DEMO3_BUILD_TEST)
189189
if ((NOT DEMO3_GEN_PROTOCOL) OR (NOT DEMO3_BUILD_PROTOCOL))
190190
message (FATAL_ERROR "DEMO3_GEN_PROTOCOL and DEMO3_BUILD_PROTOCOL are required for DEMO3_BUILD_TEST")
191191
endif ()
192-
192+
193193
execute_process(
194194
COMMAND ${CMAKE_COMMAND} -E make_directory ${DEMO3_TEST_OUTPUT_DIR}
195195
)
@@ -210,7 +210,7 @@ if (DEMO3_GEN_TEST)
210210
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
211211
-DCMAKE_GENERATOR=${CMAKE_GENERATOR} -DCMAKE_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM}
212212
-DCMAKE_GENERATOR_TOOLSET=${CMAKE_GENERATOR_TOOLSET} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
213-
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_EXE_LINKER_FLAGS=${CMAKE_EXE_LINKER_FLAGS}
213+
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_EXE_LINKER_FLAGS=${CMAKE_EXE_LINKER_FLAGS}
214214
-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
215215
-DCMAKE_PREFIX_PATH=${combined_prefix_path_str}
216216
-DOPT_USE_CCACHE=${DEMO3_USE_CCACHE}
@@ -220,32 +220,32 @@ if (DEMO3_GEN_TEST)
220220
endif ()
221221

222222
if (DEMO3_GEN_TOOLS)
223-
find_program(COMMSDSL2TOOLS_QT commsdsl2tools_qt PATH_SUFFIXES bin REQUIRED)
223+
find_program(COMMSDSL2TOOLS_QT commsdsl2tools_qt PATH_SUFFIXES bin REQUIRED)
224224
execute_process(COMMAND "${COMMSDSL2TOOLS_QT}" --version OUTPUT_VARIABLE commsdsl2tools_qt_version)
225225
if ("${commsdsl2tools_qt_version}" VERSION_LESS "${DEMO3_MIN_COMMSDSL_VERSION}")
226226
message (FATAL_ERROR "Version of commsdsl2tools_qt is too old, required minimum is v${DEMO3_MIN_COMMSDSL_VERSION}.")
227-
endif ()
227+
endif ()
228228

229229
set (tools_tmp_dir "${CMAKE_BINARY_DIR}/output_tools.tmp")
230230

231231
add_custom_target("tools_output_tgt" ALL
232232
COMMAND ${CMAKE_COMMAND} -E remove_directory ${tools_tmp_dir}
233233
COMMAND ${COMMSDSL2TOOLS_QT} ${warn_as_error} -V ${DEMO3_VERSION} ${COMMSDSL2TOOLS_QT_EXTRA_ARGS}
234234
--protocol "::CC Demo3:Synthenic demo protocol to demonstrate protocol versioning where the version is reported in the first Connect message.:cc.Demo3ProtocolPlugin"
235-
-o ${tools_tmp_dir} -c ${PROJECT_SOURCE_DIR}/src/tools ${schema_file}
235+
-o ${tools_tmp_dir} -c ${PROJECT_SOURCE_DIR}/src/tools ${schema_file}
236236
COMMAND ${CMAKE_COMMAND}
237237
-DGENERATED="${tools_tmp_dir}" -DOUTPUT="${DEMO3_TOOLS_OUTPUT_DIR}"
238-
-P "${CMAKE_CURRENT_LIST_DIR}/CopyGenerated.cmake"
238+
-P "${CMAKE_CURRENT_LIST_DIR}/CopyGenerated.cmake"
239239
DEPENDS "${CMAKE_CURRENT_LIST_DIR}/CopyGenerated.cmake" ${schema_file})
240240

241241
if (DEMO3_BUILD_TOOLS)
242242
if ((NOT DEMO3_GEN_PROTOCOL) OR (NOT DEMO3_BUILD_PROTOCOL))
243243
message (FATAL_ERROR "DEMO3_GEN_PROTOCOL and DEMO3_BUILD_PROTOCOL are required for DEMO3_BUILD_TOOLS")
244244
endif ()
245-
245+
246246
execute_process(
247247
COMMAND ${CMAKE_COMMAND} -E make_directory ${DEMO3_TOOLS_OUTPUT_DIR}
248-
)
248+
)
249249

250250
execute_process(
251251
COMMAND ${CMAKE_COMMAND} -E touch ${DEMO3_TOOLS_OUTPUT_DIR}/dummy.txt
@@ -263,21 +263,21 @@ if (DEMO3_GEN_TOOLS)
263263
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
264264
-DCMAKE_GENERATOR=${CMAKE_GENERATOR} -DCMAKE_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM}
265265
-DCMAKE_GENERATOR_TOOLSET=${CMAKE_GENERATOR_TOOLSET} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
266-
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_EXE_LINKER_FLAGS=${CMAKE_EXE_LINKER_FLAGS}
266+
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_EXE_LINKER_FLAGS=${CMAKE_EXE_LINKER_FLAGS}
267267
-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} -DCMAKE_PREFIX_PATH=${combined_prefix_path_str}
268268
-DOPT_QT_MAJOR_VERSION=${DEMO3_TOOLS_QT_VER} -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
269269
-DOPT_USE_CCACHE=${DEMO3_USE_CCACHE}
270270
-DOPT_CCACHE_EXECUTABLE=${DEMO3_CCACHE_EXECUTABLE}
271-
)
271+
)
272272
endif ()
273273
endif ()
274274

275275
if (DEMO3_GEN_SWIG)
276-
find_program(COMMSDSL2SWIG commsdsl2swig PATH_SUFFIXES bin REQUIRED)
276+
find_program(COMMSDSL2SWIG commsdsl2swig PATH_SUFFIXES bin REQUIRED)
277277
execute_process(COMMAND "${COMMSDSL2SWIG}" --version OUTPUT_VARIABLE commsdsl2swig_version)
278278
if ("${commsdsl2swig_version}" VERSION_LESS "${DEMO3_MIN_COMMSDSL_VERSION}")
279279
message (FATAL_ERROR "Version of commsdsl2swig is too old, required minimum is v${DEMO3_MIN_COMMSDSL_VERSION}.")
280-
endif ()
280+
endif ()
281281

282282
set (swig_tmp_dir "${CMAKE_BINARY_DIR}/output_swig.tmp")
283283

@@ -287,17 +287,17 @@ if (DEMO3_GEN_SWIG)
287287
-c ${DEMO3_SWIG_SRC_DIR} -o ${swig_tmp_dir} ${schema_file}
288288
COMMAND ${CMAKE_COMMAND}
289289
-DGENERATED="${swig_tmp_dir}" -DOUTPUT="${DEMO3_SWIG_OUTPUT_DIR}"
290-
-P "${CMAKE_CURRENT_LIST_DIR}/CopyGenerated.cmake"
290+
-P "${CMAKE_CURRENT_LIST_DIR}/CopyGenerated.cmake"
291291
DEPENDS "${CMAKE_CURRENT_LIST_DIR}/CopyGenerated.cmake" ${schema_file})
292292

293293
if (DEMO3_BUILD_SWIG)
294294
if ((NOT DEMO3_GEN_PROTOCOL) OR (NOT DEMO3_BUILD_PROTOCOL))
295295
message (FATAL_ERROR "DEMO3_GEN_PROTOCOL and DEMO3_BUILD_PROTOCOL are required for DEMO3_BUILD_SWIG")
296296
endif ()
297-
297+
298298
execute_process(
299299
COMMAND ${CMAKE_COMMAND} -E make_directory ${DEMO3_SWIG_OUTPUT_DIR}
300-
)
300+
)
301301

302302
execute_process(
303303
COMMAND ${CMAKE_COMMAND} -E touch ${DEMO3_SWIG_OUTPUT_DIR}/dummy.txt
@@ -317,25 +317,25 @@ if (DEMO3_GEN_SWIG)
317317
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
318318
-DCMAKE_GENERATOR=${CMAKE_GENERATOR} -DCMAKE_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM}
319319
-DCMAKE_GENERATOR_TOOLSET=${CMAKE_GENERATOR_TOOLSET} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
320-
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_EXE_LINKER_FLAGS=${CMAKE_EXE_LINKER_FLAGS}
320+
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_EXE_LINKER_FLAGS=${CMAKE_EXE_LINKER_FLAGS}
321321
-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
322322
-DCMAKE_PREFIX_PATH=${combined_prefix_path_str}
323323
-DOPT_SWIG_LANGUAGES=${combined_languages_str}
324324
-DOPT_USE_CCACHE=${DEMO3_USE_CCACHE}
325325
-DOPT_CCACHE_EXECUTABLE=${DEMO3_CCACHE_EXECUTABLE}
326326
INSTALL_COMMAND
327-
${CMAKE_COMMAND} -E echo "Skipping install"
328-
)
327+
${CMAKE_COMMAND} -E echo "Skipping install"
328+
)
329329
endif ()
330330
endif ()
331331

332332
if (DEMO3_GEN_EMSCRIPTEN)
333-
find_program(COMMSDSL2EMSCRIPTEN commsdsl2emscripten PATH_SUFFIXES bin REQUIRED)
334-
find_program(EMCMAKE_EXECUTABLE emcmake REQUIRED)
333+
find_program(COMMSDSL2EMSCRIPTEN commsdsl2emscripten PATH_SUFFIXES bin REQUIRED)
334+
find_program(EMCMAKE_EXECUTABLE emcmake REQUIRED)
335335
execute_process(COMMAND "${COMMSDSL2EMSCRIPTEN}" --version OUTPUT_VARIABLE commsdsl2emscripten_version)
336336
if ("${commsdsl2emscripten_version}" VERSION_LESS "${DEMO3_MIN_COMMSDSL_VERSION}")
337337
message (FATAL_ERROR "Version of commsdsl2emscripten is too old, required minimum is v${DEMO3_MIN_COMMSDSL_VERSION}.")
338-
endif ()
338+
endif ()
339339

340340
set (emscripten_tmp_dir "${CMAKE_BINARY_DIR}/output_emscripten.tmp")
341341

@@ -345,17 +345,17 @@ if (DEMO3_GEN_EMSCRIPTEN)
345345
-o ${emscripten_tmp_dir} -c ${PROJECT_SOURCE_DIR}/src/emscripten ${schema_file}
346346
COMMAND ${CMAKE_COMMAND}
347347
-DGENERATED="${emscripten_tmp_dir}" -DOUTPUT="${DEMO3_EMSCRIPTEN_OUTPUT_DIR}"
348-
-P "${CMAKE_CURRENT_LIST_DIR}/CopyGenerated.cmake"
348+
-P "${CMAKE_CURRENT_LIST_DIR}/CopyGenerated.cmake"
349349
DEPENDS "${CMAKE_CURRENT_LIST_DIR}/CopyGenerated.cmake" ${schema_file})
350350

351351
if (DEMO3_BUILD_EMSCRIPTEN)
352352
if ((NOT DEMO3_GEN_PROTOCOL) OR (NOT DEMO3_BUILD_PROTOCOL))
353353
message (FATAL_ERROR "DEMO3_GEN_PROTOCOL and DEMO3_BUILD_PROTOCOL are required for DEMO3_BUILD_EMSCRIPTEN")
354354
endif ()
355-
355+
356356
execute_process(
357357
COMMAND ${CMAKE_COMMAND} -E make_directory ${DEMO3_EMSCRIPTEN_OUTPUT_DIR}
358-
)
358+
)
359359

360360
execute_process(
361361
COMMAND ${CMAKE_COMMAND} -E touch ${DEMO3_EMSCRIPTEN_OUTPUT_DIR}/dummy.txt
@@ -365,7 +365,7 @@ if (DEMO3_GEN_EMSCRIPTEN)
365365
get_target_property(comms_include_dirs cc::comms INTERFACE_INCLUDE_DIRECTORIES)
366366
set (prot_include_dir "${CMAKE_INSTALL_PREFIX}/include")
367367
set (extra_includes_path ${prot_include_dir} ${comms_include_dirs})
368-
string (REPLACE ";" "|" extra_includes_path_str "${extra_includes_path}")
368+
string (REPLACE ";" "|" extra_includes_path_str "${extra_includes_path}")
369369

370370

371371
set (emscripten_build_dir ${CMAKE_CURRENT_BINARY_DIR}/emscripten_tgt_build)
@@ -379,42 +379,42 @@ if (DEMO3_GEN_EMSCRIPTEN)
379379
LIST_SEPARATOR |
380380
CMAKE_ARGS
381381
-DCMAKE_GENERATOR=${CMAKE_GENERATOR} -DCMAKE_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM}
382-
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
382+
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
383383
-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
384384
-DOPT_MODULARIZE=ON
385385
-DOPT_EXTRA_INCLUDE_DIRS=${extra_includes_path_str}
386386
-DOPT_USE_CCACHE=${DEMO3_USE_CCACHE}
387387
-DOPT_CCACHE_EXECUTABLE=${DEMO3_CCACHE_EXECUTABLE}
388-
)
388+
)
389389
endif ()
390390
endif ()
391391

392392
if (DEMO3_GEN_C)
393-
find_program(COMMSDSL2C commsdsl2c PATH_SUFFIXES bin REQUIRED)
393+
find_program(COMMSDSL2C commsdsl2c PATH_SUFFIXES bin REQUIRED)
394394
execute_process(COMMAND "${COMMSDSL2C}" --version OUTPUT_VARIABLE commsdsl2c_version)
395395
if ("${commsdsl2c_version}" VERSION_LESS "${DEMO3_MIN_COMMSDSL_VERSION}")
396396
message (FATAL_ERROR "Version of commsdsl2c is too old, required minimum is v${DEMO3_MIN_COMMSDSL_VERSION}.")
397-
endif ()
397+
endif ()
398398

399399
set (c_tmp_dir "${CMAKE_BINARY_DIR}/output_c.tmp")
400400

401401
add_custom_target("c_output_tgt" ALL
402402
COMMAND ${CMAKE_COMMAND} -E remove_directory ${c_tmp_dir}
403403
COMMAND ${COMMSDSL2C} ${warn_as_error} -V ${DEMO3_VERSION} ${COMMSDSL2C_EXTRA_ARGS}
404-
-o ${c_tmp_dir} -c ${PROJECT_SOURCE_DIR}/src/c ${schema_file}
404+
-o ${c_tmp_dir} -c ${PROJECT_SOURCE_DIR}/src/c ${schema_file}
405405
COMMAND ${CMAKE_COMMAND}
406406
-DGENERATED="${c_tmp_dir}" -DOUTPUT="${DEMO3_C_OUTPUT_DIR}"
407-
-P "${CMAKE_CURRENT_LIST_DIR}/CopyGenerated.cmake"
407+
-P "${CMAKE_CURRENT_LIST_DIR}/CopyGenerated.cmake"
408408
DEPENDS "${CMAKE_CURRENT_LIST_DIR}/CopyGenerated.cmake" ${schema_file})
409409

410410
if (DEMO3_BUILD_C)
411411
if ((NOT DEMO3_GEN_PROTOCOL) OR (NOT DEMO3_BUILD_PROTOCOL))
412412
message (FATAL_ERROR "DEMO3_GEN_PROTOCOL and DEMO3_BUILD_PROTOCOL are required for DEMO3_BUILD_C")
413413
endif ()
414-
414+
415415
execute_process(
416416
COMMAND ${CMAKE_COMMAND} -E make_directory ${DEMO3_C_OUTPUT_DIR}
417-
)
417+
)
418418

419419
execute_process(
420420
COMMAND ${CMAKE_COMMAND} -E touch ${DEMO3_C_OUTPUT_DIR}/dummy.txt
@@ -432,48 +432,48 @@ if (DEMO3_GEN_C)
432432
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
433433
-DCMAKE_GENERATOR=${CMAKE_GENERATOR} -DCMAKE_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM}
434434
-DCMAKE_GENERATOR_TOOLSET=${CMAKE_GENERATOR_TOOLSET} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
435-
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_EXE_LINKER_FLAGS=${CMAKE_EXE_LINKER_FLAGS}
435+
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_EXE_LINKER_FLAGS=${CMAKE_EXE_LINKER_FLAGS}
436436
-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} -DCMAKE_PREFIX_PATH=${combined_prefix_path_str}
437437
-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
438438
-DOPT_USE_CCACHE=${DEMO3_USE_CCACHE}
439439
-DOPT_CCACHE_EXECUTABLE=${DEMO3_CCACHE_EXECUTABLE}
440-
)
441-
440+
)
441+
442442
find_package(Doxygen)
443443
if (DEMO3_BUILD_PROT_DOC AND DOXYGEN_FOUND)
444444
ExternalProject_Add_Step(
445-
"c_tgt"
445+
"c_tgt"
446446
"doc"
447447
COMMAND ${CMAKE_COMMAND} --build ${c_build_dir} --target doc_cc_demo3_c
448448
DEPENDEES "build"
449449
DEPENDERS "install"
450450
)
451-
endif ()
451+
endif ()
452452
endif ()
453453
endif ()
454454

455455
if (DEMO3_GEN_LATEX)
456-
find_program(COMMSDSL2LATEX commsdsl2latex PATH_SUFFIXES bin REQUIRED)
456+
find_program(COMMSDSL2LATEX commsdsl2latex PATH_SUFFIXES bin REQUIRED)
457457
execute_process(COMMAND "${COMMSDSL2LATEX}" --version OUTPUT_VARIABLE commsdsl2latex_version)
458458
if ("${commsdsl2latex_version}" VERSION_LESS "${DEMO3_MIN_COMMSDSL_VERSION}")
459459
message (FATAL_ERROR "Version of commsdsl2latex is too old, required minimum is v${DEMO3_MIN_COMMSDSL_VERSION}.")
460-
endif ()
460+
endif ()
461461

462462
set (latex_tmp_dir "${CMAKE_BINARY_DIR}/output_latex.tmp")
463463

464464
add_custom_target("latext_output_tgt" ALL
465465
COMMAND ${CMAKE_COMMAND} -E remove_directory ${latex_tmp_dir}
466466
COMMAND ${COMMSDSL2LATEX} ${warn_as_error} ${COMMSDSL2LATEX_EXTRA_ARGS}
467-
-o ${latex_tmp_dir} -c ${PROJECT_SOURCE_DIR}/src/latex ${schema_file}
467+
-o ${latex_tmp_dir} -c ${PROJECT_SOURCE_DIR}/src/latex ${schema_file}
468468
COMMAND ${CMAKE_COMMAND}
469469
-DGENERATED="${latex_tmp_dir}" -DOUTPUT="${DEMO3_LATEX_OUTPUT_DIR}"
470-
-P "${CMAKE_CURRENT_LIST_DIR}/CopyGenerated.cmake"
470+
-P "${CMAKE_CURRENT_LIST_DIR}/CopyGenerated.cmake"
471471
DEPENDS "${CMAKE_CURRENT_LIST_DIR}/CopyGenerated.cmake" ${schema_file})
472472

473473
if (DEMO3_BUILD_LATEX)
474474
execute_process(
475475
COMMAND ${CMAKE_COMMAND} -E make_directory ${DEMO3_LATEX_OUTPUT_DIR}
476-
)
476+
)
477477

478478
execute_process(
479479
COMMAND ${CMAKE_COMMAND} -E touch ${DEMO3_LATEX_OUTPUT_DIR}/dummy.txt
@@ -488,13 +488,13 @@ if (DEMO3_GEN_LATEX)
488488
BINARY_DIR ${latex_build_dir}
489489
LIST_SEPARATOR |
490490
CMAKE_ARGS
491-
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
491+
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
492492
-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} -DCMAKE_PREFIX_PATH=${combined_prefix_path_str}
493493
BUILD_COMMAND
494494
${CMAKE_COMMAND} --build ${latex_build_dir} --config ${CMAKE_BUILD_TYPE} --target all_artifacts
495495
INSTALL_COMMAND
496496
${CMAKE_COMMAND} -E echo "No install for documentation build"
497-
)
497+
)
498498
endif ()
499499
endif ()
500500

‎dsl/schema.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<schema name="cc_demo3" endian="big" version="5" dslVersion="7">
2+
<schema name="cc_demo3" endian="big" version="5" dslVersion="8">
33
<fields>
44
<enum name="MsgId" type="uint8" semanticType="messageId" >
55
<validValue name="Connect" val="1" />

0 commit comments

Comments
 (0)