Skip to content

Paths to elf, hex, lst and map files are more flexible #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Paths to elf, hex, lst and map files are more flexible #24

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 15 additions & 11 deletions generic-gcc-avr.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,26 +166,30 @@ function(add_avr_executable EXECUTABLE_NAME)
message(FATAL_ERROR "No source files given for ${EXECUTABLE_NAME}.")
endif(NOT ARGN)

set(target_name ${EXECUTABLE_NAME}${MCU_TYPE_FOR_FILENAME})
set(bin_dir "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE}")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is changing the output directory, i.e. it changes behaviour, doesn't it?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it changes build directory, respectively define relation between build directory and output file. In previous case it as relative to executed cmake command.

Not saying you have to accept it, but in general, output files shall be defined as inside "build" directory.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Normally the user chooses the build directory depending on the needs, like

cmake . -Bbuild-firmware

where the build is done in build-firmware. IMHO the CMake code should respect the choice of the user and not change it in an arbitrary way.


# set file names
set(elf_file ${EXECUTABLE_NAME}${MCU_TYPE_FOR_FILENAME}.elf)
set(hex_file ${EXECUTABLE_NAME}${MCU_TYPE_FOR_FILENAME}.hex)
set(lst_file ${EXECUTABLE_NAME}${MCU_TYPE_FOR_FILENAME}.lst)
set(map_file ${EXECUTABLE_NAME}${MCU_TYPE_FOR_FILENAME}.map)
set(eeprom_image ${EXECUTABLE_NAME}${MCU_TYPE_FOR_FILENAME}-eeprom.hex)
set(elf_file "${bin_dir}/${target_name}.elf")
set(hex_file "${bin_dir}/${target_name}.hex")
set(lst_file "${bin_dir}/${target_name}.lst")
set(map_file "${bin_dir}/${target_name}.map")
set(eeprom_image "${bin_dir}/${target_name}-eeprom.hex")

set (${EXECUTABLE_NAME}_ELF_TARGET ${elf_file} PARENT_SCOPE)
set (${EXECUTABLE_NAME}_HEX_TARGET ${hex_file} PARENT_SCOPE)
set (${EXECUTABLE_NAME}_LST_TARGET ${lst_file} PARENT_SCOPE)
set (${EXECUTABLE_NAME}_MAP_TARGET ${map_file} PARENT_SCOPE)
set (${EXECUTABLE_NAME}_EEPROM_TARGET ${eeprom_file} PARENT_SCOPE)
# elf file
add_executable(${elf_file} EXCLUDE_FROM_ALL ${ARGN})
add_executable(${target_name} EXCLUDE_FROM_ALL ${ARGN})

set_target_properties(
${elf_file}
${target_name}
PROPERTIES
COMPILE_FLAGS "-mmcu=${AVR_MCU}"
COMPILE_FLAGS "-mmcu=${AVR_MCU} -DF_CPU=${MCU_SPEED}"
LINK_FLAGS "-mmcu=${AVR_MCU} -Wl,--gc-sections -mrelax -Wl,-Map,${map_file}"
OUTPUT_NAME "${target_name}.elf"
)

add_custom_command(
Expand All @@ -194,14 +198,14 @@ function(add_avr_executable EXECUTABLE_NAME)
${AVR_OBJCOPY} -j .text -j .data -O ihex ${elf_file} ${hex_file}
COMMAND
${AVR_SIZE_TOOL} ${AVR_SIZE_ARGS} ${elf_file}
DEPENDS ${elf_file}
DEPENDS ${target_name}
)

add_custom_command(
OUTPUT ${lst_file}
COMMAND
${AVR_OBJDUMP} -d ${elf_file} > ${lst_file}
DEPENDS ${elf_file}
DEPENDS ${target_name}
)

# eeprom
Expand All @@ -211,7 +215,7 @@ function(add_avr_executable EXECUTABLE_NAME)
${AVR_OBJCOPY} -j .eeprom --set-section-flags=.eeprom=alloc,load
--change-section-lma .eeprom=0 --no-change-warnings
-O ihex ${elf_file} ${eeprom_image}
DEPENDS ${elf_file}
DEPENDS ${target_name}
)

add_custom_target(
Expand Down