Skip to content

Commit 19a3754

Browse files
committed
fix include errors
2 parents caef8de + ce3e02b commit 19a3754

File tree

2 files changed

+57
-1
lines changed

2 files changed

+57
-1
lines changed

Modules/Platform/MicrochipMCU-C-XC32.cmake

+48
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,57 @@ find_program(CMAKE_C_COMPILER "xc32-gcc")
7171
find_program(CMAKE_CXX_COMPILER "xc32-g++")
7272

7373
set(MICROCHIP_C_COMPILER_ID XC32)
74+
7475
set(CMAKE_C_STANDARD_COMPUTED_DEFAULT 90)
7576
set(CMAKE_CXX_COMPILER_FORCED ON)
7677

78+
if(MICROCHIP_MCU_FAMILY STREQUAL "PIC32MX")
79+
set(lib_directory pic32mx)
80+
else()
81+
set(lib_directory pic32-libs)
82+
endif()
83+
include_directories(SYSTEM ${MICROCHIP_XC32_PATH}/${lib_directory}/include)
84+
85+
set(link_flags "")
86+
set(compile_flags "")
87+
88+
list(APPEND compile_flags
89+
"-mprocessor=${MICROCHIP_MCU_MODEL}"
90+
)
91+
string(APPEND link_flags
92+
" -mprocessor=${MICROCHIP_MCU_MODEL}"
93+
)
94+
if(MICROCHIP_LINK_SCRIPT OR MICROCHIP_MIN_HEAP_SIZE)
95+
string(APPEND link_flags
96+
" -Wl"
97+
)
98+
if(MICROCHIP_LINK_SCRIPT)
99+
string(APPEND link_flags
100+
",--script=\"${MICROCHIP_LINK_SCRIPT}\""
101+
)
102+
endif()
103+
if(MICROCHIP_MIN_HEAP_SIZE)
104+
string(APPEND link_flags
105+
",--defsym=_min_heap_size=${MICROCHIP_MIN_HEAP_SIZE}"
106+
)
107+
endif()
108+
if(MICROCHIP_MAP_FILE)
109+
string(APPEND link_flags
110+
",-Map=\"${MICROCHIP_MAP_FILE}\""
111+
)
112+
set_property(DIRECTORY APPEND
113+
PROPERTY ADDITIONAL_MAKE_CLEAN_FILES
114+
"${MICROCHIP_MAP_FILE}"
115+
)
116+
endif()
117+
endif()
118+
string(APPEND CMAKE_C_LINK_FLAGS
119+
${link_flags}
120+
)
121+
add_compile_options(
122+
${compile_flags}
123+
)
124+
77125
if(CMAKE_C_COMPILER)
78126
_xc32_get_version()
79127
endif()

toolchain.cmake

+9-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ elseif(MICROCHIP_MCU STREQUAL "generic32")
101101
set(CMAKE_SYSTEM_PROCESSOR "PIC_32")
102102

103103
elseif(MICROCHIP_MCU MATCHES "^(dsPIC|PIC)(32M[XZ]|[0-9]+[A-Z])([A-Z0-9]+)$")
104-
set(MICROCHIP_MCU_FAMILY "${CMAKE_MATCH_1}${CMAKE_MATCH_2}")
104+
set(MICROCHIP_MCU_FAMILY "${CMAKE_MATCH_1}${CMAKE_MATCH_2}" CACHE STRING "Familia de chip")
105105
set(MICROCHIP_MCU_MODEL "${CMAKE_MATCH_2}${CMAKE_MATCH_3}" CACHE STRING "Modelo de chip")
106106

107107
if(MICROCHIP_MCU_FAMILY IN_LIST MICROCHIP_FAMILIES_8)
@@ -130,6 +130,14 @@ message(STATUS "microchip toolchain")
130130
if(MICROCHIP_XC32_PATH)
131131
set(link_flags "")
132132
set(compile_flags "")
133+
134+
if(MICROCHIP_MCU_FAMILY STREQUAL "PIC32MX")
135+
set(lib_directory pic32mx)
136+
else()
137+
set(lib_directory pic32-libs)
138+
endif()
139+
140+
include_directories(SYSTEM ${MICROCHIP_XC32_PATH}/${lib_directory}/include)
133141

134142
list(APPEND compile_flags
135143
"-mprocessor=${MICROCHIP_MCU_MODEL}"

0 commit comments

Comments
 (0)