Skip to content

Commit bb42736

Browse files
committed
fix #1253 CMake program target .elf path is wrong
1 parent e39bca4 commit bb42736

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -181,59 +181,59 @@ function(modm_targets_create project_name)
181181
add_custom_target(size DEPENDS ${project_name}.elf)
182182
add_custom_command(TARGET size
183183
USES_TERMINAL
184-
COMMAND cmake -E env 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}/${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
190190
COMMAND cmake -E env PYTHONPATH=modm ${Python3_EXECUTABLE} -m modm_tools.openocd -f modm/openocd.cfg
191-
${PROJECT_BINARY_DIR}/src/${project_name}.elf
191+
${PROJECT_BINARY_DIR}/${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
197197
COMMAND cmake -E env PYTHONPATH=modm ${Python3_EXECUTABLE} -m modm_tools.bmp -p ${MODM_BMP_PORT}
198-
${PROJECT_BINARY_DIR}/src/${project_name}.elf
198+
${PROJECT_BINARY_DIR}/${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
204204
COMMAND cmake -E env PYTHONPATH=modm ${Python3_EXECUTABLE} -m modm_tools.jlink -device {{ jlink_partname }}
205-
${PROJECT_BINARY_DIR}/src/${project_name}.elf
205+
${PROJECT_BINARY_DIR}/${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
211211
COMMAND cmake -E env PYTHONPATH=modm ${Python3_EXECUTABLE} -m modm_tools.gdb -x modm/gdbinit -x modm/openocd_gdbinit
212-
--elf ${PROJECT_BINARY_DIR}/src/${project_name}.elf --ui=${MODM_DBG_UI}
212+
--elf ${PROJECT_BINARY_DIR}/${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
219219
COMMAND cmake -E env PYTHONPATH=modm ${Python3_EXECUTABLE} -m modm_tools.gdb -x modm/gdbinit -x modm/openocd_bmp
220-
--elf ${PROJECT_BINARY_DIR}/src/${project_name}.elf --ui=${MODM_DBG_UI}
220+
--elf ${PROJECT_BINARY_DIR}/${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
227227
COMMAND cmake -E env PYTHONPATH=modm ${Python3_EXECUTABLE} -m modm_tools.gdb -x modm/gdbinit -x modm/openocd_jlink
228-
--elf ${PROJECT_BINARY_DIR}/src/${project_name}.elf --ui=${MODM_DBG_UI}
228+
--elf ${PROJECT_BINARY_DIR}/${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
235235
COMMAND cmake -E env PYTHONPATH=modm ${Python3_EXECUTABLE} -m modm_tools.gdb -x modm/gdbinit
236-
--elf ${PROJECT_BINARY_DIR}/src/${project_name}.elf --ui=${MODM_DBG_UI}
236+
--elf ${PROJECT_BINARY_DIR}/${project_name}.elf --ui=${MODM_DBG_UI}
237237
crashdebug
238238
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
239239

0 commit comments

Comments
 (0)