Просмотр исходного кода

stm32: common: Refactor '_stm32_generate_file'

Variables now have more explicit names.
Alexander Voronov 3 лет назад
Родитель
Сommit
7c4badabd9
1 измененных файлов с 6 добавлено и 6 удалено
  1. 6 6
      cmake/stm32/common.cmake

+ 6 - 6
cmake/stm32/common.cmake

@@ -61,16 +61,16 @@ function(stm32_print_size_of_target TARGET)
 endfunction()
 endfunction()
 
 
 function(_stm32_generate_file TARGET OUTPUT_EXTENSION OBJCOPY_BFD_OUTPUT)
 function(_stm32_generate_file TARGET OUTPUT_EXTENSION OBJCOPY_BFD_OUTPUT)
-    get_target_property(OUTPUT_NAME ${TARGET} OUTPUT_NAME)
+    get_target_property(TARGET_OUTPUT_NAME ${TARGET} OUTPUT_NAME)
     get_target_property(RUNTIME_OUTPUT_DIRECTORY ${TARGET} RUNTIME_OUTPUT_DIRECTORY)
     get_target_property(RUNTIME_OUTPUT_DIRECTORY ${TARGET} RUNTIME_OUTPUT_DIRECTORY)
-    set(FILE_NAME "${OUTPUT_NAME}.${OUTPUT_EXTENSION}")
-    set(FILE "${RUNTIME_OUTPUT_DIRECTORY}/${FILE_NAME}")
+    set(OUTPUT_FILE_NAME "${TARGET_OUTPUT_NAME}.${OUTPUT_EXTENSION}")
+    set(OUTPUT_FILE_PATH "${RUNTIME_OUTPUT_DIRECTORY}/${OUTPUT_FILE_NAME}")
     add_custom_command(
     add_custom_command(
         TARGET ${TARGET}
         TARGET ${TARGET}
         POST_BUILD
         POST_BUILD
-        COMMAND ${CMAKE_OBJCOPY} -O ${OBJCOPY_BFD_OUTPUT} "$<TARGET_FILE:${TARGET}>" ${FILE}
-        BYPRODUCTS ${FILE}
-        COMMENT "Generating ${OBJCOPY_BFD_OUTPUT} file ${FILE_NAME}"
+        COMMAND ${CMAKE_OBJCOPY} -O ${OBJCOPY_BFD_OUTPUT} "$<TARGET_FILE:${TARGET}>" ${OUTPUT_FILE_PATH}
+        BYPRODUCTS ${OUTPUT_FILE_PATH}
+        COMMENT "Generating ${OBJCOPY_BFD_OUTPUT} file ${OUTPUT_FILE_NAME}"
     )
     )
 endfunction()
 endfunction()