Skip to content

Commit 6098b80

Browse files
committed
Mejorado soporte para ensamblador
1 parent bc6beae commit 6098b80

File tree

2 files changed

+36
-35
lines changed

2 files changed

+36
-35
lines changed

Modules/MicrochipBin2Hex.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ function(add_bin2hex_target target)
1919
)
2020

2121
if(NOT MICROCHIP_BIN2HEX)
22-
message(SEND_ERROR "No bin2hex program was found")
22+
message(SEND_ERROR "No bin2hex program was found. _CMAKE_TOOLCHAIN_PREFIX=${_CMAKE_TOOLCHAIN_PREFIX}")
2323
endif()
2424

2525
function(get_target_property_fallback var target)

Modules/Platform/MicrochipMCU-C-XC32.cmake

Lines changed: 35 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
# to provide information specific to the XC32 compiler
1616

1717
include(MicrochipPathSearch)
18+
set(_CMAKE_TOOLCHAIN_PREFIX "xc32-")
1819
MICROCHIP_PATH_SEARCH(MICROCHIP_XC32_PATH xc32
1920
CACHE "the path to a Microchip XC32 installation"
2021
STORE_VERSION MICROCHIP_C_COMPILER_VERSION
@@ -68,42 +69,42 @@ set(MICROCHIP_C_COMPILER_ID XC32)
6869
set(CMAKE_C_STANDARD_COMPUTED_DEFAULT 90)
6970
set(CMAKE_CXX_COMPILER_FORCED ON)
7071

71-
message(${CMAKE_ASM_COMPILER})
72+
if(CMAKE_C_COMPILER)
73+
_xc32_get_version()
7274

73-
_xc32_get_version()
75+
set(link_flags "")
76+
set(compile_flags "")
7477

75-
set(link_flags "")
76-
set(compile_flags "")
77-
78-
list(APPEND compile_flags
79-
"-mprocessor=${MICROCHIP_MCU_MODEL}"
80-
)
81-
string(APPEND link_flags
82-
" -mprocessor=${MICROCHIP_MCU_MODEL}"
83-
)
84-
if(MICROCHIP_LINK_SCRIPT OR MICROCHIP_MIN_HEAP_SIZE)
85-
string(APPEND link_flags
86-
" -Wl"
87-
)
88-
if(MICROCHIP_LINK_SCRIPT)
89-
string(APPEND link_flags
90-
",--script=\"${MICROCHIP_LINK_SCRIPT}\""
91-
)
92-
endif()
93-
if(MICROCHIP_MIN_HEAP_SIZE)
94-
string(APPEND link_flags
95-
",--defsym=_min_heap_size=${MICROCHIP_MIN_HEAP_SIZE}"
96-
)
97-
endif()
98-
if(MICROCHIP_MAP_FILE)
99-
string(APPEND link_flags
100-
",-Map=\"${MICROCHIP_MAP_FILE}\""
101-
)
102-
set_property(DIRECTORY APPEND
103-
PROPERTY ADDITIONAL_MAKE_CLEAN_FILES
104-
"${MICROCHIP_MAP_FILE}"
105-
)
106-
endif()
78+
list(APPEND compile_flags
79+
"-mprocessor=${MICROCHIP_MCU_MODEL}"
80+
)
81+
string(APPEND link_flags
82+
" -mprocessor=${MICROCHIP_MCU_MODEL}"
83+
)
84+
if(MICROCHIP_LINK_SCRIPT OR MICROCHIP_MIN_HEAP_SIZE)
85+
string(APPEND link_flags
86+
" -Wl"
87+
)
88+
if(MICROCHIP_LINK_SCRIPT)
89+
string(APPEND link_flags
90+
",--script=\"${MICROCHIP_LINK_SCRIPT}\""
91+
)
92+
endif()
93+
if(MICROCHIP_MIN_HEAP_SIZE)
94+
string(APPEND link_flags
95+
",--defsym=_min_heap_size=${MICROCHIP_MIN_HEAP_SIZE}"
96+
)
97+
endif()
98+
if(MICROCHIP_MAP_FILE)
99+
string(APPEND link_flags
100+
",-Map=\"${MICROCHIP_MAP_FILE}\""
101+
)
102+
set_property(DIRECTORY APPEND
103+
PROPERTY ADDITIONAL_MAKE_CLEAN_FILES
104+
"${MICROCHIP_MAP_FILE}"
105+
)
106+
endif()
107+
endif()
107108
endif()
108109

109110
add_compile_options(

0 commit comments

Comments
 (0)