Skip to content

Commit a5cee07

Browse files
committed
[cmake] Fix build on windows
1 parent 97ffcb4 commit a5cee07

File tree

1 file changed

+21
-21
lines changed

1 file changed

+21
-21
lines changed

tools/build_script_generator/cmake/resources/ModmConfiguration.cmake.in

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99

1010
# This file was autogenerated by the modm cmake builder. Do not modify!
1111

12-
find_program(PYTHON3_EXECUTABLE python3 REQUIRED)
13-
1412
# This function will prevent in-source builds
1513
function(assure_out_of_source_builds)
1614
# make sure the user doesn't play dirty with symlinks
@@ -164,6 +162,8 @@ set({{ name | upper }}{{ "_" ~ (profile | upper) if profile | length else "" }}
164162
endfunction()
165163

166164
function(modm_targets_create project_name)
165+
find_package(Python3 COMPONENTS Interpreter REQUIRED)
166+
167167
set_target_properties(${project_name}
168168
PROPERTIES SUFFIX ".elf")
169169

@@ -175,132 +175,132 @@ function(modm_targets_create project_name)
175175
%% if core.startswith("cortex-m")
176176
add_custom_command(TARGET ${project_name}
177177
POST_BUILD
178-
COMMAND PYTHONPATH=${PROJECT_SOURCE_DIR}/modm ${PYTHON3_EXECUTABLE} -m modm_tools.size ${project_name}.elf \"{{ memories }}\")
178+
COMMAND cmake -E env PYTHONPATH=${PROJECT_SOURCE_DIR}/modm ${Python3_EXECUTABLE} -m modm_tools.size ${project_name}.elf \"{{ memories }}\")
179179
%% endif
180180

181181
add_custom_target(size DEPENDS ${project_name}.elf)
182182
add_custom_command(TARGET size
183183
USES_TERMINAL
184-
COMMAND PYTHONPATH=modm ${PYTHON3_EXECUTABLE} -m modm_tools.size ${PROJECT_BINARY_DIR}/src/${project_name}.elf \"{{ memories }}\"
184+
COMMAND cmake -E env PYTHONPATH=modm ${Python3_EXECUTABLE} -m modm_tools.size ${PROJECT_BINARY_DIR}/src/${project_name}.elf \"{{ memories }}\"
185185
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
186186

187187
add_custom_target(program DEPENDS ${project_name}.elf)
188188
add_custom_command(TARGET program
189189
USES_TERMINAL
190-
COMMAND PYTHONPATH=modm ${PYTHON3_EXECUTABLE} -m modm_tools.openocd -f modm/openocd.cfg
190+
COMMAND cmake -E env PYTHONPATH=modm ${Python3_EXECUTABLE} -m modm_tools.openocd -f modm/openocd.cfg
191191
${PROJECT_BINARY_DIR}/src/${project_name}.elf
192192
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
193193

194194
add_custom_target(program-bmp DEPENDS ${project_name}.elf)
195195
add_custom_command(TARGET program-bmp
196196
USES_TERMINAL
197-
COMMAND PYTHONPATH=modm ${PYTHON3_EXECUTABLE} -m modm_tools.bmp -p ${MODM_BMP_PORT}
197+
COMMAND cmake -E env PYTHONPATH=modm ${Python3_EXECUTABLE} -m modm_tools.bmp -p ${MODM_BMP_PORT}
198198
${PROJECT_BINARY_DIR}/src/${project_name}.elf
199199
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
200200

201201
add_custom_target(program-jlink DEPENDS ${project_name}.elf)
202202
add_custom_command(TARGET program-jlink
203203
USES_TERMINAL
204-
COMMAND PYTHONPATH=modm ${PYTHON3_EXECUTABLE} -m modm_tools.jlink -device {{ jlink_partname }}
204+
COMMAND cmake -E env PYTHONPATH=modm ${Python3_EXECUTABLE} -m modm_tools.jlink -device {{ jlink_partname }}
205205
${PROJECT_BINARY_DIR}/src/${project_name}.elf
206206
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
207207

208208
add_custom_target(debug DEPENDS ${project_name}.elf)
209209
add_custom_command(TARGET debug
210210
USES_TERMINAL
211-
COMMAND PYTHONPATH=modm ${PYTHON3_EXECUTABLE} -m modm_tools.gdb -x modm/gdbinit -x modm/openocd_gdbinit
211+
COMMAND cmake -E env PYTHONPATH=modm ${Python3_EXECUTABLE} -m modm_tools.gdb -x modm/gdbinit -x modm/openocd_gdbinit
212212
--elf ${PROJECT_BINARY_DIR}/src/${project_name}.elf --ui=${MODM_DBG_UI}
213213
openocd -f modm/openocd.cfg
214214
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
215215

216216
add_custom_target(debug-bmp DEPENDS ${project_name}.elf)
217217
add_custom_command(TARGET debug-bmp
218218
USES_TERMINAL
219-
COMMAND PYTHONPATH=modm ${PYTHON3_EXECUTABLE} -m modm_tools.gdb -x modm/gdbinit -x modm/openocd_bmp
219+
COMMAND cmake -E env PYTHONPATH=modm ${Python3_EXECUTABLE} -m modm_tools.gdb -x modm/gdbinit -x modm/openocd_bmp
220220
--elf ${PROJECT_BINARY_DIR}/src/${project_name}.elf --ui=${MODM_DBG_UI}
221221
bmp -p ${MODM_BMP_PORT}
222222
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
223223

224224
add_custom_target(debug-jlink DEPENDS ${project_name}.elf)
225225
add_custom_command(TARGET debug-jlink
226226
USES_TERMINAL
227-
COMMAND PYTHONPATH=modm ${PYTHON3_EXECUTABLE} -m modm_tools.gdb -x modm/gdbinit -x modm/openocd_jlink
227+
COMMAND cmake -E env PYTHONPATH=modm ${Python3_EXECUTABLE} -m modm_tools.gdb -x modm/gdbinit -x modm/openocd_jlink
228228
--elf ${PROJECT_BINARY_DIR}/src/${project_name}.elf --ui=${MODM_DBG_UI}
229229
jlink -device {{ jlink_partname }}
230230
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
231231

232232
add_custom_target(debug-coredump DEPENDS ${project_name}.elf)
233233
add_custom_command(TARGET debug-coredump
234234
USES_TERMINAL
235-
COMMAND PYTHONPATH=modm ${PYTHON3_EXECUTABLE} -m modm_tools.gdb -x modm/gdbinit
235+
COMMAND cmake -E env PYTHONPATH=modm ${Python3_EXECUTABLE} -m modm_tools.gdb -x modm/gdbinit
236236
--elf ${PROJECT_BINARY_DIR}/src/${project_name}.elf --ui=${MODM_DBG_UI}
237237
crashdebug
238238
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
239239

240240
add_custom_target(coredump)
241241
add_custom_command(TARGET coredump
242242
USES_TERMINAL
243-
COMMAND PYTHONPATH=modm ${PYTHON3_EXECUTABLE} -m modm_tools.gdb -x modm/gdbinit
243+
COMMAND cmake -E env PYTHONPATH=modm ${Python3_EXECUTABLE} -m modm_tools.gdb -x modm/gdbinit
244244
-ex "modm_coredump" -ex "modm_build_id" -ex "quit"
245245
openocd -f modm/openocd.cfg
246246
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
247247

248248
add_custom_target(coredump-bmp)
249249
add_custom_command(TARGET coredump-bmp
250250
USES_TERMINAL
251-
COMMAND PYTHONPATH=modm ${PYTHON3_EXECUTABLE} -m modm_tools.gdb -x modm/gdbinit
251+
COMMAND cmake -E env PYTHONPATH=modm ${Python3_EXECUTABLE} -m modm_tools.gdb -x modm/gdbinit
252252
-ex "modm_coredump" -ex "modm_build_id" -ex "quit"
253253
bmp -p ${MODM_BMP_PORT}
254254
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
255255

256256
add_custom_target(coredump-jlink)
257257
add_custom_command(TARGET coredump-jlink
258258
USES_TERMINAL
259-
COMMAND PYTHONPATH=modm ${PYTHON3_EXECUTABLE} -m modm_tools.gdb -x modm/gdbinit
259+
COMMAND cmake -E env PYTHONPATH=modm ${Python3_EXECUTABLE} -m modm_tools.gdb -x modm/gdbinit
260260
-ex "modm_coredump" -ex "modm_build_id" -ex "quit"
261261
jlink -device {{ jlink_partname }}
262262
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
263263

264264
add_custom_target(reset)
265265
add_custom_command(TARGET reset
266266
USES_TERMINAL
267-
COMMAND PYTHONPATH=modm ${PYTHON3_EXECUTABLE} -m modm_tools.openocd -f modm/openocd.cfg --reset
267+
COMMAND cmake -E env PYTHONPATH=modm ${Python3_EXECUTABLE} -m modm_tools.openocd -f modm/openocd.cfg --reset
268268
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
269269

270270
add_custom_target(reset-bmp)
271271
add_custom_command(TARGET reset-bmp
272272
USES_TERMINAL
273-
COMMAND PYTHONPATH=modm ${PYTHON3_EXECUTABLE} -m modm_tools.bmp -p ${MODM_BMP_PORT} --reset
273+
COMMAND cmake -E env PYTHONPATH=modm ${Python3_EXECUTABLE} -m modm_tools.bmp -p ${MODM_BMP_PORT} --reset
274274
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
275275

276276
add_custom_target(reset-jlink)
277277
add_custom_command(TARGET reset-jlink
278278
USES_TERMINAL
279-
COMMAND PYTHONPATH=modm ${PYTHON3_EXECUTABLE} -m modm_tools.jlink -device {{ jlink_partname }} --reset
279+
COMMAND cmake -E env PYTHONPATH=modm ${Python3_EXECUTABLE} -m modm_tools.jlink -device {{ jlink_partname }} --reset
280280
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
281281

282282
add_custom_target(log-itm)
283283
add_custom_command(TARGET log-itm
284284
USES_TERMINAL
285-
COMMAND PYTHONPATH=modm ${PYTHON3_EXECUTABLE} -m modm_tools.itm openocd -f modm/openocd.cfg --fcpu ${MODM_ITM_FCPU}
285+
COMMAND cmake -E env PYTHONPATH=modm ${Python3_EXECUTABLE} -m modm_tools.itm openocd -f modm/openocd.cfg --fcpu ${MODM_ITM_FCPU}
286286
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
287287

288288
add_custom_target(log-itm-jlink)
289289
add_custom_command(TARGET log-itm-jlink
290290
USES_TERMINAL
291-
COMMAND PYTHONPATH=modm ${PYTHON3_EXECUTABLE} -m modm_tools.itm jlink -device {{ jlink_partname }}
291+
COMMAND cmake -E env PYTHONPATH=modm ${Python3_EXECUTABLE} -m modm_tools.itm jlink -device {{ jlink_partname }}
292292
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
293293

294294
add_custom_target(log-rtt)
295295
add_custom_command(TARGET log-rtt
296296
USES_TERMINAL
297-
COMMAND PYTHONPATH=modm ${PYTHON3_EXECUTABLE} -m modm_tools.rtt --channel ${MODM_RTT_CHANNEL} openocd -f modm/openocd.cfg
297+
COMMAND cmake -E env PYTHONPATH=modm ${Python3_EXECUTABLE} -m modm_tools.rtt --channel ${MODM_RTT_CHANNEL} openocd -f modm/openocd.cfg
298298
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
299299

300300
add_custom_target(log-rtt-jlink)
301301
add_custom_command(TARGET log-rtt-jlink
302302
USES_TERMINAL
303-
COMMAND PYTHONPATH=modm ${PYTHON3_EXECUTABLE} -m modm_tools.rtt --channel ${MODM_RTT_CHANNEL} jlink -device {{ jlink_partname }}
303+
COMMAND cmake -E env PYTHONPATH=modm ${Python3_EXECUTABLE} -m modm_tools.rtt --channel ${MODM_RTT_CHANNEL} jlink -device {{ jlink_partname }}
304304
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
305305
endfunction()
306306

0 commit comments

Comments
 (0)