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

stm32: common: Fix 'stm32_generate_*_file' output file path

Target's property 'RUNTIME_OUTPUT_DIRECTORY' better suited for
defining output file path.
Alexander Voronov 3 лет назад
Родитель
Сommit
637c95cafc
1 измененных файлов с 6 добавлено и 6 удалено
  1. 6 6
      cmake/stm32/common.cmake

+ 6 - 6
cmake/stm32/common.cmake

@@ -62,9 +62,9 @@ endfunction()
 
 
 function(stm32_generate_binary_file TARGET)
 function(stm32_generate_binary_file TARGET)
     get_target_property(OUTPUT_NAME ${TARGET} OUTPUT_NAME)
     get_target_property(OUTPUT_NAME ${TARGET} OUTPUT_NAME)
-    get_target_property(BINARY_DIR ${TARGET} BINARY_DIR)
+    get_target_property(RUNTIME_OUTPUT_DIRECTORY ${TARGET} RUNTIME_OUTPUT_DIRECTORY)
     set(FILE_NAME "${OUTPUT_NAME}.bin")
     set(FILE_NAME "${OUTPUT_NAME}.bin")
-    set(FILE "${BINARY_DIR}/${FILE_NAME}")
+    set(FILE "${RUNTIME_OUTPUT_DIRECTORY}/${FILE_NAME}")
     add_custom_command(
     add_custom_command(
         TARGET ${TARGET}
         TARGET ${TARGET}
         POST_BUILD
         POST_BUILD
@@ -76,9 +76,9 @@ endfunction()
 
 
 function(stm32_generate_srec_file TARGET)
 function(stm32_generate_srec_file TARGET)
     get_target_property(OUTPUT_NAME ${TARGET} OUTPUT_NAME)
     get_target_property(OUTPUT_NAME ${TARGET} OUTPUT_NAME)
-    get_target_property(BINARY_DIR ${TARGET} BINARY_DIR)
+    get_target_property(RUNTIME_OUTPUT_DIRECTORY ${TARGET} RUNTIME_OUTPUT_DIRECTORY)
     set(FILE_NAME "${OUTPUT_NAME}.srec")
     set(FILE_NAME "${OUTPUT_NAME}.srec")
-    set(FILE "${BINARY_DIR}/${FILE_NAME}")
+    set(FILE "${RUNTIME_OUTPUT_DIRECTORY}/${FILE_NAME}")
     add_custom_command(
     add_custom_command(
         TARGET ${TARGET}
         TARGET ${TARGET}
         POST_BUILD
         POST_BUILD
@@ -90,9 +90,9 @@ endfunction()
 
 
 function(stm32_generate_hex_file TARGET)
 function(stm32_generate_hex_file TARGET)
     get_target_property(OUTPUT_NAME ${TARGET} OUTPUT_NAME)
     get_target_property(OUTPUT_NAME ${TARGET} OUTPUT_NAME)
-    get_target_property(BINARY_DIR ${TARGET} BINARY_DIR)
+    get_target_property(RUNTIME_OUTPUT_DIRECTORY ${TARGET} RUNTIME_OUTPUT_DIRECTORY)
     set(FILE_NAME "${OUTPUT_NAME}.hex")
     set(FILE_NAME "${OUTPUT_NAME}.hex")
-    set(FILE "${BINARY_DIR}/${FILE_NAME}")
+    set(FILE "${RUNTIME_OUTPUT_DIRECTORY}/${FILE_NAME}")
     add_custom_command(
     add_custom_command(
         TARGET ${TARGET}
         TARGET ${TARGET}
         POST_BUILD
         POST_BUILD