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

Merge pull request #314 stm32: common: Fix '_stm32_generate_file'

stm32: common: Fix '_stm32_generate_file'
Hish15 3 лет назад
Родитель
Сommit
5d70c4384e
1 измененных файлов с 5 добавлено и 1 удалено
  1. 5 1
      cmake/stm32/common.cmake

+ 5 - 1
cmake/stm32/common.cmake

@@ -72,7 +72,11 @@ endfunction()
 # The generated file will be placed in the same directory as the target output file.
 function(_stm32_generate_file TARGET OUTPUT_EXTENSION OBJCOPY_BFD_OUTPUT)
     get_target_property(TARGET_OUTPUT_NAME ${TARGET} OUTPUT_NAME)
-    set(OUTPUT_FILE_NAME "${TARGET_OUTPUT_NAME}.${OUTPUT_EXTENSION}")
+    if (TARGET_OUTPUT_NAME)
+        set(OUTPUT_FILE_NAME "${TARGET_OUTPUT_NAME}.${OUTPUT_EXTENSION}")
+    else()
+        set(OUTPUT_FILE_NAME "${TARGET}.${OUTPUT_EXTENSION}")
+    endif()
 
     get_target_property(RUNTIME_OUTPUT_DIRECTORY ${TARGET} RUNTIME_OUTPUT_DIRECTORY)
     if(RUNTIME_OUTPUT_DIRECTORY)