Skip to content

Commit fc168ed

Browse files
josesimoesjosesimoes
committed
Work CI-CD
- Replace deprecated CMake API. ***NO_CI***
1 parent cf89369 commit fc168ed

File tree

14 files changed

+33
-33
lines changed

14 files changed

+33
-33
lines changed

‎CMake/Modules/STM32_CubePackage.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -153,13 +153,13 @@ macro(ProcessSTM32CubePackage)
153153
endif()
154154

155155
FetchContent_GetProperties(stm32${TARGET_SERIES_SHORT_LOWER}_hal_driver)
156-
FetchContent_Populate(stm32${TARGET_SERIES_SHORT_LOWER}_hal_driver)
156+
FetchContent_MakeAvailable(stm32${TARGET_SERIES_SHORT_LOWER}_hal_driver)
157157

158158
FetchContent_GetProperties(cmsis_device_${TARGET_SERIES_SHORT_LOWER})
159-
FetchContent_Populate(cmsis_device_${TARGET_SERIES_SHORT_LOWER})
159+
FetchContent_MakeAvailable(cmsis_device_${TARGET_SERIES_SHORT_LOWER})
160160

161161
FetchContent_GetProperties(cmsis_core)
162-
FetchContent_Populate(cmsis_core)
162+
FetchContent_MakeAvailable(cmsis_core)
163163

164164
endmacro()
165165

‎CMake/binutils.common.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -743,7 +743,7 @@ function(nf_add_mbedtls_library)
743743
FetchContent_GetProperties(mbedtls)
744744
if(NOT mbedtls_POPULATED)
745745
# Fetch the content using previously declared details
746-
FetchContent_Populate(mbedtls)
746+
FetchContent_MakeAvailable(mbedtls)
747747
endif()
748748

749749
# don't include tests or programs, only build libraries
@@ -803,7 +803,7 @@ function(nf_add_lwip_library)
803803

804804
if(NOT lwip_POPULATED)
805805
# Fetch the content using previously declared details
806-
FetchContent_Populate(lwip)
806+
FetchContent_MakeAvailable(lwip)
807807
endif()
808808

809809
endfunction()

‎targets/AzureRTOS/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ else()
109109

110110
endif()
111111

112-
FetchContent_Populate(azure_rtos)
112+
FetchContent_MakeAvailable(azure_rtos)
113113

114114
###########################
115115
# Azure RTOS USBX
@@ -168,7 +168,7 @@ if(AZURERTOS_USBX_REQUIRED)
168168

169169
endif()
170170

171-
FetchContent_Populate(azure_rtos_usbx)
171+
FetchContent_MakeAvailable(azure_rtos_usbx)
172172

173173
endif()
174174

@@ -229,7 +229,7 @@ if(AZURERTOS_FILEX_REQUIRED)
229229

230230
endif()
231231

232-
FetchContent_Populate(azure_rtos_filex)
232+
FetchContent_MakeAvailable(azure_rtos_filex)
233233

234234
endif()
235235

@@ -293,7 +293,7 @@ if(AZURERTOS_NETXDUO_REQUIRED)
293293
# enable BSD layer in NetX Duo
294294
set(NXD_ENABLE_BSD TRUE)
295295

296-
FetchContent_Populate(azure_rtos_netxduo)
296+
FetchContent_MakeAvailable(azure_rtos_netxduo)
297297

298298
endif()
299299

‎targets/AzureRTOS/Maxim/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ else()
6262

6363
endif()
6464

65-
FetchContent_Populate(maxim_micros_sdk)
65+
FetchContent_MakeAvailable(maxim_micros_sdk)
6666

6767
# make vars global
6868
set(NANOCLR_PROJECT_SOURCES ${NANOCLR_PROJECT_SOURCES} CACHE INTERNAL "make global")
@@ -125,7 +125,7 @@ else()
125125
endif()
126126

127127
FetchContent_GetProperties(cmsis)
128-
FetchContent_Populate(cmsis)
128+
FetchContent_MakeAvailable(cmsis)
129129

130130
# add platform dirs
131131
add_subdirectory(_include)

‎targets/AzureRTOS/MicroBit/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ else()
6060

6161
endif()
6262

63-
FetchContent_Populate(CODALMicroBitV2)
63+
FetchContent_MakeAvailable(CODALMicroBitV2)
6464

6565
####################
6666
# CODAL Core
@@ -116,7 +116,7 @@ else()
116116

117117
endif()
118118

119-
FetchContent_Populate(CodalCore)
119+
FetchContent_MakeAvailable(CodalCore)
120120

121121
####################
122122
# CODAL NRF52
@@ -172,7 +172,7 @@ else()
172172

173173
endif()
174174

175-
FetchContent_Populate(CodalNrf52)
175+
FetchContent_MakeAvailable(CodalNrf52)
176176

177177
########################
178178
# CODAL Micro Bit NRF52 SDK
@@ -228,7 +228,7 @@ else()
228228

229229
endif()
230230

231-
FetchContent_Populate(CodalMicrobitNrf5Sdk)
231+
FetchContent_MakeAvailable(CodalMicrobitNrf5Sdk)
232232

233233
# make vars global
234234
set(NANOCLR_PROJECT_SOURCES ${NANOCLR_PROJECT_SOURCES} CACHE INTERNAL "make global")

‎targets/AzureRTOS/Nordic/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ else()
5757

5858
endif()
5959

60-
FetchContent_Populate(nRFConnectSdk)
60+
FetchContent_MakeAvailable(nRFConnectSdk)
6161

6262
# Point to NCS root directory
6363
set(NRF_DIR ${nRFConnectSdk_SOURCE_DIR} CACHE PATH "NCS root directory")

‎targets/AzureRTOS/RaspberryPi/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ else()
6060

6161
endif()
6262

63-
FetchContent_Populate(pico_sdk)
63+
FetchContent_MakeAvailable(pico_sdk)
6464

6565
# set these to help Pico SDK
6666
set(PICO_TOOLCHAIN_PATH ${TOOLCHAIN_PREFIX})

‎targets/AzureRTOS/ST/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ else()
8181
endif()
8282

8383
FetchContent_GetProperties(chibios)
84-
FetchContent_Populate(chibios)
84+
FetchContent_MakeAvailable(chibios)
8585

8686
list(APPEND TARGET_AZURERTOS_COMMON_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/_include)
8787

‎targets/AzureRTOS/SiliconLabs/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ else()
114114
endif()
115115

116116
FetchContent_GetProperties(gecko_sdk)
117-
FetchContent_Populate(gecko_sdk)
117+
FetchContent_MakeAvailable(gecko_sdk)
118118

119119
# including here the CMake files for the source files specific to the target series
120120
include(AzureRTOS_${TARGET_SERIES}_sources)

‎targets/ChibiOS/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ endif()
106106
FetchContent_GetProperties(chibios)
107107
if(NOT chibios_POPULATED)
108108
# Fetch the content using previously declared details
109-
FetchContent_Populate(chibios)
109+
FetchContent_MakeAvailable(chibios)
110110
endif()
111111

112112
if(CHIBIOS_CONTRIB_REQUIRED)
@@ -137,7 +137,7 @@ if(CHIBIOS_CONTRIB_REQUIRED)
137137
FetchContent_GetProperties(chibios-contrib)
138138
if(NOT chibios-contrib_POPULATED)
139139
# Fetch the content using previously declared details
140-
FetchContent_Populate(chibios-contrib)
140+
FetchContent_MakeAvailable(chibios-contrib)
141141
endif()
142142

143143
endif()
@@ -199,7 +199,7 @@ if(NF_FEATURE_HAS_SDCARD OR NF_FEATURE_HAS_USB_MSD)
199199
FetchContent_GetProperties(fatfs)
200200
if(NOT fatfs_POPULATED)
201201
# Fetch the content using previously declared details
202-
FetchContent_Populate(fatfs)
202+
FetchContent_MakeAvailable(fatfs)
203203
endif()
204204

205205
# have to delete the ffconf.h template from the repo
@@ -373,7 +373,7 @@ if(NF_FEATURE_USE_LITTLEFS_OPTION)
373373
FetchContent_GetProperties(littlefs)
374374
if(NOT littlefs_POPULATED)
375375
# Fetch the content using previously declared details
376-
FetchContent_Populate(littlefs)
376+
FetchContent_MakeAvailable(littlefs)
377377
endif()
378378

379379
endif()

0 commit comments

Comments
 (0)