@@ -33,8 +33,8 @@ option (DEMO1_BUILD_EXAMPLES "Build examples." ON)
3333# COMMSDSL2SWIG_EXTRA_ARGS - Extra arguments to pass to "commsdsl2swig"
3434# COMMSDSL2EMSCRIPTEN_EXTRA_ARGS - Extra arguments to pass to "commsdsl2emscripten"
3535
36- set (DEMO1_VERSION "2.9 " )
37- set (DEMO1_MIN_COMMSDSL_VERSION "6.3.4 " )
36+ set (DEMO1_VERSION "3.0 " )
37+ set (DEMO1_MIN_COMMSDSL_VERSION "7.0 " )
3838
3939if (("${CMAKE_VERSION} " VERSION_GREATER_EQUAL "3.30" ) AND
4040 (NOT DEFINED CMAKE_POLICY_DEFAULT_CMP0167 ))
@@ -99,23 +99,15 @@ if (DEMO1_GEN_PROTOCOL)
9999
100100 set (prot_tmp_dir "${CMAKE_BINARY_DIR} /output.tmp" )
101101
102- add_custom_target (rm_prot_tmp_tgt
102+ add_custom_target (${PROT_OUTPUT_TGT} ALL
103103 COMMAND ${CMAKE_COMMAND} -E remove_directory ${prot_tmp_dir}
104- )
105-
106- add_custom_command (
107- OUTPUT ${prot_tmp_dir}
108- DEPENDS ${schema_file} ${src_files} rm_prot_tmp_tgt
109104 COMMAND ${COMMSDSL2COMMS} ${warn_as_error} -V ${DEMO1_VERSION}
110105 -o ${prot_tmp_dir} -c ${PROJECT_SOURCE_DIR} /src/protocol
111- ${COMMSDSL2COMMS_EXTRA_ARGS} ${schema_file}
112- )
113-
114- add_custom_target (${PROT_OUTPUT_TGT} ALL
106+ ${COMMSDSL2COMMS_EXTRA_ARGS} ${schema_file}
115107 COMMAND ${CMAKE_COMMAND}
116108 -DGENERATED="${prot_tmp_dir} " -DOUTPUT="${DEMO1_PROT_OUTPUT_DIR} "
117109 -P "${CMAKE_CURRENT_LIST_DIR} /CopyGenerated.cmake"
118- DEPENDS ${prot_tmp_dir} "${CMAKE_CURRENT_LIST_DIR} /CopyGenerated.cmake" ${schema_file} )
110+ DEPENDS "${CMAKE_CURRENT_LIST_DIR} /CopyGenerated.cmake" ${schema_file} )
119111
120112 if (DEMO1_BUILD_PROTOCOL)
121113 execute_process (
@@ -168,22 +160,14 @@ if (DEMO1_GEN_TEST)
168160
169161 set (test_tmp_dir "${CMAKE_BINARY_DIR} /output_test.tmp" )
170162
171- add_custom_target (rm_test_tmp_tgt
163+ add_custom_target ("test_output_tgt" ALL
172164 COMMAND ${CMAKE_COMMAND} -E remove_directory ${test_tmp_dir}
173- )
174-
175- add_custom_command (
176- OUTPUT ${test_tmp_dir}
177- DEPENDS ${schema_file} ${src_files} rm_test_tmp_tgt
178165 COMMAND ${COMMSDSL2TEST} ${warn_as_error} ${COMMSDSL2TEST_EXTRA_ARGS}
179166 -o ${test_tmp_dir} -c ${PROJECT_SOURCE_DIR} /src/test ${schema_file}
180- )
181-
182- add_custom_target ("test_output_tgt" ALL
183167 COMMAND ${CMAKE_COMMAND}
184168 -DGENERATED="${test_tmp_dir} " -DOUTPUT="${DEMO1_TEST_OUTPUT_DIR} "
185169 -P "${CMAKE_CURRENT_LIST_DIR} /CopyGenerated.cmake"
186- DEPENDS ${test_tmp_dir} "${CMAKE_CURRENT_LIST_DIR} /CopyGenerated.cmake" ${schema_file} )
170+ DEPENDS "${CMAKE_CURRENT_LIST_DIR} /CopyGenerated.cmake" ${schema_file} )
187171
188172 if (DEMO1_BUILD_TEST)
189173 if ((NOT DEMO1_GEN_PROTOCOL) OR (NOT DEMO1_BUILD_PROTOCOL))
@@ -228,23 +212,15 @@ if (DEMO1_GEN_TOOLS)
228212
229213 set (tools_tmp_dir "${CMAKE_BINARY_DIR} /output_tools.tmp" )
230214
231- add_custom_target (rm_tools_tmp_tgt
215+ add_custom_target ("tools_output_tgt" ALL
232216 COMMAND ${CMAKE_COMMAND} -E remove_directory ${tools_tmp_dir}
233- )
234-
235- add_custom_command (
236- OUTPUT ${tools_tmp_dir}
237- DEPENDS ${schema_file} ${src_files} rm_tools_tmp_tgt
238217 COMMAND ${COMMSDSL2TOOLS_QT} ${warn_as_error} ${COMMSDSL2TOOLS_QT_EXTRA_ARGS}
239218 --protocol "::CC Demo1:Synthenic demo protocol to demonstrate definition of various fields as well as simple protocol framing.:cc.Demo1ProtocolPlugin"
240- -o ${tools_tmp_dir} -c ${PROJECT_SOURCE_DIR} /src/tools ${schema_file}
241- )
242-
243- add_custom_target ("tools_output_tgt" ALL
219+ -o ${tools_tmp_dir} -c ${PROJECT_SOURCE_DIR} /src/tools ${schema_file}
244220 COMMAND ${CMAKE_COMMAND}
245221 -DGENERATED="${tools_tmp_dir} " -DOUTPUT="${DEMO1_TOOLS_OUTPUT_DIR} "
246222 -P "${CMAKE_CURRENT_LIST_DIR} /CopyGenerated.cmake"
247- DEPENDS ${tools_tmp_dir} "${CMAKE_CURRENT_LIST_DIR} /CopyGenerated.cmake" ${schema_file} )
223+ DEPENDS "${CMAKE_CURRENT_LIST_DIR} /CopyGenerated.cmake" ${schema_file} )
248224
249225 if (DEMO1_BUILD_TOOLS)
250226 if ((NOT DEMO1_GEN_PROTOCOL) OR (NOT DEMO1_BUILD_PROTOCOL))
@@ -289,22 +265,14 @@ if (DEMO1_GEN_SWIG)
289265
290266 set (swig_tmp_dir "${CMAKE_BINARY_DIR} /output_swig.tmp" )
291267
292- add_custom_target (rm_swig_tmp_tgt
268+ add_custom_target ("swig_output_tgt" ALL
293269 COMMAND ${CMAKE_COMMAND} -E remove_directory ${swig_tmp_dir}
294- )
295-
296- add_custom_command (
297- OUTPUT ${swig_tmp_dir}
298- DEPENDS ${schema_file} ${src_files} rm_swig_tmp_tgt
299270 COMMAND ${COMMSDSL2SWIG} ${warn_as_error} ${COMMSDSL2SWIG_EXTRA_ARGS}
300271 -c ${DEMO1_SWIG_SRC_DIR} -o ${swig_tmp_dir} ${schema_file}
301- )
302-
303- add_custom_target ("swig_output_tgt" ALL
304272 COMMAND ${CMAKE_COMMAND}
305273 -DGENERATED="${swig_tmp_dir} " -DOUTPUT="${DEMO1_SWIG_OUTPUT_DIR} "
306274 -P "${CMAKE_CURRENT_LIST_DIR} /CopyGenerated.cmake"
307- DEPENDS ${swig_tmp_dir} "${CMAKE_CURRENT_LIST_DIR} /CopyGenerated.cmake" ${schema_file} )
275+ DEPENDS "${CMAKE_CURRENT_LIST_DIR} /CopyGenerated.cmake" ${schema_file} )
308276
309277 if (DEMO1_BUILD_SWIG)
310278 if ((NOT DEMO1_GEN_PROTOCOL) OR (NOT DEMO1_BUILD_PROTOCOL))
@@ -355,22 +323,14 @@ if (DEMO1_GEN_EMSCRIPTEN)
355323
356324 set (emscripten_tmp_dir "${CMAKE_BINARY_DIR} /output_emscripten.tmp" )
357325
358- add_custom_target (rm_emscripten_tmp_tgt
326+ add_custom_target ("emscripten_output_tgt" ALL
359327 COMMAND ${CMAKE_COMMAND} -E remove_directory ${emscripten_tmp_dir}
360- )
361-
362- add_custom_command (
363- OUTPUT ${emscripten_tmp_dir}
364- DEPENDS ${schema_file} ${src_files} rm_emscripten_tmp_tgt
365328 COMMAND ${COMMSDSL2EMSCRIPTEN} ${warn_as_error} ${COMMSDSL2EMSCRIPTEN_EXTRA_ARGS}
366329 -o ${emscripten_tmp_dir} -c ${PROJECT_SOURCE_DIR} /src/emscripten ${schema_file}
367- )
368-
369- add_custom_target ("emscripten_output_tgt" ALL
370330 COMMAND ${CMAKE_COMMAND}
371331 -DGENERATED="${emscripten_tmp_dir} " -DOUTPUT="${DEMO1_EMSCRIPTEN_OUTPUT_DIR} "
372332 -P "${CMAKE_CURRENT_LIST_DIR} /CopyGenerated.cmake"
373- DEPENDS ${emscripten_tmp_dir} "${CMAKE_CURRENT_LIST_DIR} /CopyGenerated.cmake" ${schema_file} )
333+ DEPENDS "${CMAKE_CURRENT_LIST_DIR} /CopyGenerated.cmake" ${schema_file} )
374334
375335 if (DEMO1_BUILD_EMSCRIPTEN)
376336 if ((NOT DEMO1_GEN_PROTOCOL) OR (NOT DEMO1_BUILD_PROTOCOL))
0 commit comments