Skip to content

Commit 6d2b96a

Browse files
arobenkoarobenko
committed
Release v2.6
2 parents 54fce3c + bcfb9ff commit 6d2b96a

26 files changed

+2023
-105
lines changed

‎.appveyor.yml

+22-8
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
image:
22
- Visual Studio 2022
33
- Visual Studio 2019
4-
- Visual Studio 2017
54

65

76
init:
@@ -19,20 +18,28 @@ configuration:
1918
- Release
2019

2120
environment:
22-
COMMS_BRANCH: v5.2.1
23-
COMMSDSL_BRANCH: v6.2.4
24-
CC_TOOLS_QT_BRANCH: v4.2.3
21+
COMMS_BRANCH: v5.2.2
22+
COMMSDSL_BRANCH: v6.3
23+
CC_TOOLS_QT_BRANCH: v5.1
2524
matrix:
2625
- CPP_STD: 11
26+
QT_MAJOR: 5
27+
EXTRA_CONFIG: -DMQTTSN_BUILD_TOOLS=OFF
2728
- CPP_STD: 14
29+
QT_MAJOR: 5
30+
EXTRA_CONFIG: -DMQTTSN_BUILD_TOOLS=OFF
2831
- CPP_STD: 17
32+
QT_MAJOR: 5
2933
- CPP_STD: 20
34+
QT_MAJOR: 5
35+
- CPP_STD: 20
36+
QT_MAJOR: 6
3037

3138
matrix:
3239
fast_finish: false
3340
exclude:
34-
- image: Visual Studio 2017
35-
CPP_STD: 20
41+
- platform: x86
42+
QT_MAJOR: 6
3643

3744
install:
3845
- call script\appveyor_install.bat
@@ -45,13 +52,20 @@ install:
4552
- set COMMON_INSTALL_DIR=%BUILD_DIR%\install
4653
- set COMMON_BUILD_TYPE=%CONFIGURATION%
4754
- set COMMON_CXX_STANDARD=%CPP_STD%
55+
- set GENERATOR="%CMAKE_GENERATOR%"
56+
- set PLATFORM="%CMAKE_PLATFORM%"
57+
- set CC_TOOLS_QT_MAJOR_QT_VERSION=%QT_MAJOR%
4858
- call script\prepare_externals.bat
4959

5060
build_script:
5161
- echo ------------------------- Building Project -------------------------
5262
- cd %BUILD_DIR%
53-
- cmake .. -DCMAKE_BUILD_TYPE=%CONFIGURATION% -G "NMake Makefiles" -DBOOST_ROOT="%BOOST_DIR%" -DBoost_USE_STATIC_LIBS=ON -DCMAKE_INSTALL_PREFIX="%COMMON_INSTALL_DIR%" -DCMAKE_PREFIX_PATH="%COMMON_INSTALL_DIR%" -DCMAKE_CXX_STANDARD=%CPP_STD% -DMQTTSN_GEN_PROTOCOL=ON -DMQTTSN_GEN_TEST=ON -DMQTTSN_GEN_TOOLS=ON
54-
- cmake --build . --config %CONFIGURATION%
63+
- cmake .. -DCMAKE_BUILD_TYPE=%CONFIGURATION% -G "%CMAKE_GENERATOR%" %PLATFORM_PARAM% ^
64+
-DBOOST_ROOT="%BOOST_DIR%" -DBoost_USE_STATIC_LIBS=ON -DCMAKE_INSTALL_PREFIX="%COMMON_INSTALL_DIR%" ^
65+
-DCMAKE_PREFIX_PATH="%COMMON_INSTALL_DIR%" -DCMAKE_CXX_STANDARD=%CPP_STD% ^
66+
-DMQTTSN_GEN_PROTOCOL=ON -DMQTTSN_GEN_TEST=ON -DMQTTSN_GEN_TOOLS=ON -DMQTTSN_TOOLS_QT_VER=%QT_MAJOR% ^
67+
%EXTRA_CONFIG%
68+
- cmake --build . --config %CONFIGURATION% --parallel %NUMBER_OF_PROCESSORS%
5569

5670

5771

‎.github/workflows/actions_build.yml

+27-15
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ name: Github Actions Build
33
on: [push]
44

55
env:
6-
COMMS_BRANCH: v5.2.1
7-
COMMSDSL_BRANCH: v6.2.4
8-
CC_TOOLS_QT_BRANCH: v4.2.3
6+
COMMS_BRANCH: v5.2.2
7+
COMMSDSL_BRANCH: v6.3
8+
CC_TOOLS_QT_BRANCH: v5.1
99

1010
jobs:
1111
build_gcc_old_ubuntu_20_04:
@@ -29,7 +29,7 @@ jobs:
2929
run: sudo apt-get update --fix-missing
3030

3131
- name: Install Packages
32-
run: sudo apt install libqt5gui5 qtbase5-dev libxml2-dev gcc-${{matrix.cc_ver}} g++-${{matrix.cc_ver}} gcc-8 g++-8
32+
run: sudo apt install libqt5gui5 qtbase5-dev libboost-all-dev libxml2-dev gcc-${{matrix.cc_ver}} g++-${{matrix.cc_ver}} gcc-8 g++-8
3333

3434
- name: Create Build Environment
3535
run: cmake -E make_directory ${{runner.workspace}}/build
@@ -96,7 +96,7 @@ jobs:
9696
run: sudo apt-get update --fix-missing
9797

9898
- name: Install Packages
99-
run: sudo apt install libqt5gui5 qtbase5-dev libxml2-dev gcc-${{matrix.cc_ver}} g++-${{matrix.cc_ver}} gcc-8 g++-8
99+
run: sudo apt install libqt5gui5 qtbase5-dev libboost-all-dev libxml2-dev gcc-${{matrix.cc_ver}} g++-${{matrix.cc_ver}} gcc-8 g++-8
100100

101101
- name: Create Build Environment
102102
run: cmake -E make_directory ${{runner.workspace}}/build
@@ -124,10 +124,11 @@ jobs:
124124
run: |
125125
cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{matrix.type}} -DCMAKE_INSTALL_PREFIX=install \
126126
-DCMAKE_PREFIX_PATH=${{runner.workspace}}/build/install -DCMAKE_CXX_STANDARD=${{matrix.cpp}} \
127-
-DMQTTSN_GEN_PROTOCOL=ON -DMQTTSN_GEN_TEST=ON -DMQTTSN_GEN_TOOLS=ON
127+
-DMQTTSN_GEN_PROTOCOL=ON -DMQTTSN_GEN_TEST=ON -DMQTTSN_GEN_TOOLS=ON -DMQTTSN_BUILD_TOOLS=${{env.BUILD_TOOLS}}
128128
env:
129129
CC: gcc-${{matrix.cc_ver}}
130130
CXX: g++-${{matrix.cc_ver}}
131+
BUILD_TOOLS: "${{ matrix.cpp >= 17 && 'ON' || 'OFF' }}"
131132

132133
- name: Build Target
133134
working-directory: ${{runner.workspace}}/build
@@ -144,6 +145,7 @@ jobs:
144145
type: [Debug, Release, MinSizeRel]
145146
cc_ver: [9, 10, 11, 12]
146147
cpp: [11, 14, 17, 20]
148+
qt_ver: [5, 6]
147149

148150
steps:
149151
- uses: actions/checkout@v2
@@ -153,7 +155,7 @@ jobs:
153155

154156
- name: Install Packages
155157
run: |
156-
sudo apt install libqt5gui5 qtbase5-dev libxml2-dev gcc-${{matrix.cc_ver}} g++-${{matrix.cc_ver}} \
158+
sudo apt install libqt${{matrix.qt_ver}}gui${{matrix.qt_ver}} qtbase5-dev qt6-base-dev libboost-all-dev libxml2-dev gcc-${{matrix.cc_ver}} g++-${{matrix.cc_ver}} \
157159
python3 libpython3-dev swig default-jdk default-jre emscripten
158160
159161
- name: Create Build Environment
@@ -173,18 +175,20 @@ jobs:
173175
COMMS_TAG: ${{env.COMMS_BRANCH}}
174176
COMMSDSL_TAG: ${{env.COMMSDSL_BRANCH}}
175177
CC_TOOLS_QT_TAG: ${{env.CC_TOOLS_QT_BRANCH}}
178+
CC_TOOLS_QT_MAJOR_QT_VERSION: ${{matrix.qt_ver}}
176179

177180
- name: Configure CMake
178181
shell: bash
179182
working-directory: ${{runner.workspace}}/build
180183
run: |
181184
cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{matrix.type}} -DCMAKE_INSTALL_PREFIX=install \
182185
-DCMAKE_PREFIX_PATH=${{runner.workspace}}/build/install -DCMAKE_CXX_STANDARD=${{matrix.cpp}} \
183-
-DMQTTSN_GEN_PROTOCOL=ON -DMQTTSN_GEN_TEST=ON -DMQTTSN_GEN_TOOLS=ON \
186+
-DMQTTSN_GEN_PROTOCOL=ON -DMQTTSN_GEN_TEST=ON -DMQTTSN_GEN_TOOLS=ON -DMQTTSN_BUILD_TOOLS=${{env.BUILD_TOOLS}} \
184187
-DMQTTSN_GEN_SWIG=ON -DMQTTSN_GEN_EMSCRIPTEN=ON
185188
env:
186189
CC: gcc-${{matrix.cc_ver}}
187190
CXX: g++-${{matrix.cc_ver}}
191+
BUILD_TOOLS: "${{ matrix.cpp >= 17 && 'ON' || 'OFF' }}"
188192

189193
- name: Build Target
190194
working-directory: ${{runner.workspace}}/build
@@ -218,7 +222,7 @@ jobs:
218222
run: sudo apt-get update --fix-missing
219223

220224
- name: Install Packages
221-
run: sudo apt install libqt5gui5 qtbase5-dev libxml2-dev clang-${{matrix.cc_ver}} clang-6.0
225+
run: sudo apt install libqt5gui5 qtbase5-dev libboost-all-dev libxml2-dev clang-${{matrix.cc_ver}} clang-6.0
222226

223227

224228
- name: Create Build Environment
@@ -247,10 +251,12 @@ jobs:
247251
run: |
248252
cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{matrix.type}} -DCMAKE_INSTALL_PREFIX=install \
249253
-DCMAKE_EXE_LINKER_FLAGS=-fuse-ld=gold -DCMAKE_PREFIX_PATH=${{runner.workspace}}/build/install \
250-
-DCMAKE_CXX_STANDARD=${{matrix.cpp}} -DMQTTSN_GEN_PROTOCOL=ON -DMQTTSN_GEN_TEST=ON -DMQTTSN_GEN_TOOLS=ON
254+
-DCMAKE_CXX_STANDARD=${{matrix.cpp}} -DMQTTSN_GEN_PROTOCOL=ON -DMQTTSN_GEN_TEST=ON \
255+
-DMQTTSN_GEN_TOOLS=ON -DMQTTSN_BUILD_TOOLS=${{env.BUILD_TOOLS}}
251256
env:
252257
CC: clang-${{matrix.cc_ver}}
253258
CXX: clang++-${{matrix.cc_ver}}
259+
BUILD_TOOLS: "${{ matrix.cpp >= 17 && 'ON' || 'OFF' }}"
254260

255261
- name: Build Target
256262
working-directory: ${{runner.workspace}}/build
@@ -280,7 +286,7 @@ jobs:
280286
run: sudo apt-get update --fix-missing
281287

282288
- name: Install Packages
283-
run: sudo apt install libqt5gui5 qtbase5-dev libxml2-dev clang-${{matrix.cc_ver}}
289+
run: sudo apt install libqt5gui5 qtbase5-dev libboost-all-dev libxml2-dev clang-${{matrix.cc_ver}}
284290

285291
- name: Create Build Environment
286292
run: cmake -E make_directory ${{runner.workspace}}/build
@@ -299,17 +305,19 @@ jobs:
299305
COMMS_TAG: ${{env.COMMS_BRANCH}}
300306
COMMSDSL_TAG: ${{env.COMMSDSL_BRANCH}}
301307
CC_TOOLS_QT_TAG: ${{env.CC_TOOLS_QT_BRANCH}}
308+
CC_TOOLS_QT_SKIP: "${{ matrix.cpp < 17 && '1' || '0' }}"
302309

303310
- name: Configure CMake
304311
shell: bash
305312
working-directory: ${{runner.workspace}}/build
306313
run: |
307314
cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{matrix.type}} -DCMAKE_INSTALL_PREFIX=install \
308315
-DCMAKE_PREFIX_PATH=${{runner.workspace}}/build/install -DCMAKE_CXX_STANDARD=${{matrix.cpp}} \
309-
-DMQTTSN_GEN_PROTOCOL=ON -DMQTTSN_GEN_TEST=ON -DMQTTSN_GEN_TOOLS=ON
316+
-DMQTTSN_GEN_PROTOCOL=ON -DMQTTSN_GEN_TEST=ON -DMQTTSN_GEN_TOOLS=ON -DMQTTSN_BUILD_TOOLS=${{env.BUILD_TOOLS}}
310317
env:
311318
CC: clang-${{matrix.cc_ver}}
312319
CXX: clang++-${{matrix.cc_ver}}
320+
BUILD_TOOLS: "${{ matrix.cpp == 17 && 'ON' || 'OFF' }}"
313321

314322
- name: Build Target
315323
working-directory: ${{runner.workspace}}/build
@@ -324,8 +332,9 @@ jobs:
324332
fail-fast: false
325333
matrix:
326334
type: [Debug, Release, MinSizeRel]
327-
cc_ver: [12, 13, 14]
335+
cc_ver: [12, 13, 14, 15]
328336
cpp: [11, 14, 17, 20]
337+
qt_ver: [5, 6]
329338

330339
steps:
331340
- uses: actions/checkout@v2
@@ -335,7 +344,7 @@ jobs:
335344

336345
- name: Install Packages
337346
run: |
338-
sudo apt install libqt5gui5 qtbase5-dev libxml2-dev clang-${{matrix.cc_ver}} \
347+
sudo apt install libqt${{matrix.qt_ver}}gui${{matrix.qt_ver}} qtbase5-dev qt6-base-dev libboost-all-dev libxml2-dev clang-${{matrix.cc_ver}} \
339348
python3 libpython3-dev swig default-jdk default-jre emscripten
340349
341350
- name: Create Build Environment
@@ -355,18 +364,21 @@ jobs:
355364
COMMS_TAG: ${{env.COMMS_BRANCH}}
356365
COMMSDSL_TAG: ${{env.COMMSDSL_BRANCH}}
357366
CC_TOOLS_QT_TAG: ${{env.CC_TOOLS_QT_BRANCH}}
367+
CC_TOOLS_QT_MAJOR_QT_VERSION: ${{matrix.qt_ver}}
368+
CC_TOOLS_QT_SKIP: "${{ (matrix.cpp < 17 || (matrix.cpp == 20 && matrix.cc_ver < 15)) && '1' || '0' }}"
358369

359370
- name: Configure CMake
360371
shell: bash
361372
working-directory: ${{runner.workspace}}/build
362373
run: |
363374
cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{matrix.type}} -DCMAKE_INSTALL_PREFIX=install \
364375
-DCMAKE_PREFIX_PATH=${{runner.workspace}}/build/install -DCMAKE_CXX_STANDARD=${{matrix.cpp}} \
365-
-DMQTTSN_GEN_PROTOCOL=ON -DMQTTSN_GEN_TEST=ON -DMQTTSN_GEN_TOOLS=ON \
376+
-DMQTTSN_GEN_PROTOCOL=ON -DMQTTSN_GEN_TEST=ON -DMQTTSN_GEN_TOOLS=ON -DMQTTSN_BUILD_TOOLS=${{env.BUILD_TOOLS}} \
366377
-DMQTTSN_GEN_SWIG=ON -DMQTTSN_GEN_EMSCRIPTEN=ON
367378
env:
368379
CC: clang-${{matrix.cc_ver}}
369380
CXX: clang++-${{matrix.cc_ver}}
381+
BUILD_TOOLS: "${{ (matrix.cpp < 17 || (matrix.cpp == 20 && matrix.cc_ver < 15)) && 'OFF' || 'ON' }}"
370382

371383
- name: Build Target
372384
working-directory: ${{runner.workspace}}/build

‎CMakeLists.txt

+17-16
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,9 @@ option (MQTTSN_BUILD_EMSCRIPTEN "Build and install project generated by the comm
2020
# MQTTSN_PROT_OUTPUT_DIR - Path to protocol output directory. If not provided <build_dir>/output one is used.
2121
# MQTTSN_TEST_OUTPUT_DIR - Path to test output directory. If not provided <build_dir>/output_tools one is used.
2222
# MQTTSN_TOOLS_OUTPUT_DIR - Path to tools output directory. If not provided <build_dir>/output_tools one is used.
23+
# MQTTSN_TOOLS_QT_VER - Major Qt version to be used when building tools output. Defaults to 5
2324
# MQTTSN_SWIG_OUTPUT_DIR - Path to swig output directory. If not provided <build_dir>/output_swig one is used.
24-
# MQTTSN_SWIG_SRC_DIR - Path to the commsdsl2swig sources. If not provided local "swig_src" dir is used.
25+
# MQTTSN_SWIG_SRC_DIR - Path to the commsdsl2swig sources. If not provided local "src/swig" dir is used.
2526
# MQTTSN_SWIG_LANGUAGES - Languages list to support by swig. If not provided "python java csharp" are chosen
2627
# MQTTSN_EMSCRIPTEN_OUTPUT_DIR - Path to emscripten output directory. If not provided <build_dir>/output_emscripten one is used.
2728
# COMMSDSL2COMMS_EXTRA_ARGS - Extra arguments to pass to "commsdsl2comms"
@@ -30,8 +31,8 @@ option (MQTTSN_BUILD_EMSCRIPTEN "Build and install project generated by the comm
3031
# COMMSDSL2SWIG_EXTRA_ARGS - Extra arguments to pass to "commsdsl2swig"
3132
# COMMSDSL2EMSCRIPTEN_EXTRA_ARGS - Extra arguments to pass to "commsdsl2emscripten"
3233

33-
set (MQTTSN_VERSION "2.5")
34-
set (MQTTSN_MIN_COMMSDSL_VERSION "6.2.4")
34+
set (MQTTSN_VERSION "2.6")
35+
set (MQTTSN_MIN_COMMSDSL_VERSION "6.3")
3536

3637
set (EXTERNALS_DIR "${PROJECT_SOURCE_DIR}/externals")
3738

@@ -56,7 +57,7 @@ if ("${MQTTSN_SWIG_OUTPUT_DIR}" STREQUAL "")
5657
endif ()
5758

5859
if ("${MQTTSN_SWIG_SRC_DIR}" STREQUAL "")
59-
set (MQTTSN_SWIG_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/swig_src)
60+
set (MQTTSN_SWIG_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/swig)
6061
endif ()
6162

6263
if ("${MQTTSN_SWIG_LANGUAGES}" STREQUAL "")
@@ -67,6 +68,10 @@ if ("${MQTTSN_EMSCRIPTEN_OUTPUT_DIR}" STREQUAL "")
6768
set (MQTTSN_EMSCRIPTEN_OUTPUT_DIR "${CMAKE_BINARY_DIR}/output_emscripten")
6869
endif ()
6970

71+
if ("${MQTTSN_TOOLS_QT_VER}" STREQUAL "")
72+
set (MQTTSN_TOOLS_QT_VER 5)
73+
endif ()
74+
7075
set (warn_as_error "--warn-as-err")
7176
if (NOT MQTTSN_WARN_AS_ERR)
7277
set (warn_as_error)
@@ -86,16 +91,11 @@ if (MQTTSN_GEN_PROTOCOL)
8691
COMMAND ${CMAKE_COMMAND} -E remove_directory ${prot_tmp_dir}
8792
)
8893

89-
set (code_input_param)
90-
if (EXISTS ${PROJECT_SOURCE_DIR}/src)
91-
set (code_input_param -c ${PROJECT_SOURCE_DIR}/src)
92-
endif ()
93-
9494
add_custom_command(
9595
OUTPUT ${prot_tmp_dir}
9696
DEPENDS ${schema_file} ${src_files} rm_prot_tmp_tgt
9797
COMMAND ${COMMSDSL2COMMS} ${warn_as_error} -V ${MQTTSN_VERSION} ${code_input_param}
98-
-o ${prot_tmp_dir}
98+
-o ${prot_tmp_dir} -c ${PROJECT_SOURCE_DIR}/src/protocol
9999
${COMMSDSL2COMMS_EXTRA_ARGS} ${schema_file}
100100
)
101101

@@ -110,7 +110,7 @@ if (MQTTSN_GEN_PROTOCOL)
110110
COMMAND ${CMAKE_COMMAND}
111111
-DGENERATED="${prot_tmp_dir}" -DOUTPUT="${MQTTSN_PROT_OUTPUT_DIR}"
112112
-P "${CMAKE_CURRENT_LIST_DIR}/CopyGenerated.cmake"
113-
DEPENDS ${prot_tmp_dir} ${readme_file} "${CMAKE_CURRENT_LIST_DIR}/CopyGenerated.cmake" ${schema_file})
113+
DEPENDS ${prot_tmp_dir} "${CMAKE_CURRENT_LIST_DIR}/CopyGenerated.cmake" ${schema_file})
114114

115115
if (MQTTSN_BUILD_PROTOCOL)
116116
execute_process(
@@ -171,7 +171,7 @@ if (MQTTSN_GEN_TEST)
171171
OUTPUT ${test_tmp_dir}
172172
DEPENDS ${schema_file} ${src_files} rm_test_tmp_tgt
173173
COMMAND ${COMMSDSL2TEST} ${warn_as_error} ${COMMSDSL2TEST_EXTRA_ARGS}
174-
-o ${test_tmp_dir} ${schema_file}
174+
-o ${test_tmp_dir} -c ${PROJECT_SOURCE_DIR}/src/test ${schema_file}
175175
)
176176

177177
add_custom_target("test_output_tgt" ALL
@@ -229,7 +229,8 @@ if (MQTTSN_GEN_TOOLS)
229229
OUTPUT ${tools_tmp_dir}
230230
DEPENDS ${schema_file} ${src_files} rm_tools_tmp_tgt
231231
COMMAND ${COMMSDSL2TOOLS_QT} ${warn_as_error} ${COMMSDSL2TOOLS_QT_EXTRA_ARGS}
232-
-o ${tools_tmp_dir} ${schema_file}
232+
--protocol "::CC MQTT-SN:MQTT-SN protocol.:cc.MqttSnProtocolPlugin"
233+
-o ${tools_tmp_dir} -c ${PROJECT_SOURCE_DIR}/src/tools ${schema_file}
233234
)
234235

235236
add_custom_target("tools_output_tgt" ALL
@@ -264,8 +265,8 @@ if (MQTTSN_GEN_TOOLS)
264265
-DCMAKE_GENERATOR=${CMAKE_GENERATOR} -DCMAKE_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM}
265266
-DCMAKE_GENERATOR_TOOLSET=${CMAKE_GENERATOR_TOOLSET} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
266267
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_EXE_LINKER_FLAGS=${CMAKE_EXE_LINKER_FLAGS}
267-
-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
268-
-DCMAKE_PREFIX_PATH=${combined_prefix_path_str}
268+
-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} -DCMAKE_PREFIX_PATH=${combined_prefix_path_str}
269+
-DOPT_QT_MAJOR_VERSION=${MQTTSN_TOOLS_QT_VER}
269270
)
270271
endif ()
271272
endif ()
@@ -351,7 +352,7 @@ if (MQTTSN_GEN_EMSCRIPTEN)
351352
OUTPUT ${emscripten_tmp_dir}
352353
DEPENDS ${schema_file} ${src_files} rm_emscripten_tmp_tgt
353354
COMMAND ${COMMSDSL2EMSCRIPTEN} ${warn_as_error} ${COMMSDSL2EMSCRIPTEN_EXTRA_ARGS}
354-
-o ${emscripten_tmp_dir} ${schema_file}
355+
-o ${emscripten_tmp_dir} -c ${PROJECT_SOURCE_DIR}/src/emscripten ${schema_file}
355356
)
356357

357358
add_custom_target("emscripten_output_tgt" ALL

‎readme.generated

-14
This file was deleted.

0 commit comments

Comments
 (0)