Skip to content

Commit

Permalink
build(all): fix CMake FetchContent_Populate deprecated
Browse files Browse the repository at this point in the history 
Replaced `FetchContent_Populate` with `FetchContent_MakeAvailable` i
to fix deprectation warning by CMake

IMPORTANT:
  `pico_sdk_import.cmake` is not updated, due to compatibility issues.
  We have to wait until official repository is updated!
  • Loading branch information
@DavidFederl
DavidFederl committed Feb 3, 2025
1 parent 5999eac commit 36afabe
Show file tree
Hide file tree
Showing 4 changed files with 101 additions and 190 deletions.
2 changes: 2 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
### Custom ###
.justfile
.vimrc
.tool-versions
.venv
networks.txt
Expand Down
167 changes: 82 additions & 85 deletions cmake/third_party_deps.cmake
View file
Original file line number Diff line number Diff line change
@@ -1,102 +1,99 @@
include(FetchContent)


# include pico-sdk
macro(add_pico_sdk tag)
set(PICO_SDK_FETCH_FROM_GIT on)
set(PICO_SDK_FETCH_FROM_GIT_TAG ${tag})
set(PICOTOOL_FETCH_FROM_GIT_PATH ${CMAKE_SOURCE_DIR}/picotool)
include(pico_sdk_import.cmake)
set(PICO_SDK_FETCH_FROM_GIT on)
set(PICO_SDK_FETCH_FROM_GIT_TAG ${tag})
set(PICOTOOL_FETCH_FROM_GIT_PATH ${CMAKE_SOURCE_DIR}/picotool)
include(${CMAKE_SOURCE_DIR}/cmake/pico_sdk_import.cmake)
endmacro()


function(add_cexception)
FetchContent_Declare(
cexception
GIT_REPOSITORY https://github.com/ThrowTheSwitch/CException.git
GIT_TAG v1.3.3
)
FetchContent_Populate(cexception)
add_library(CException__impl ${cexception_SOURCE_DIR}/lib/CException.c)
add_library(CException__hdrs INTERFACE)
target_include_directories(CException__hdrs INTERFACE ${cexception_SOURCE_DIR}/lib/)
add_library(CException INTERFACE)
target_link_libraries(CException INTERFACE CException__hdrs CException__impl)
FetchContent_Declare(
cexception
GIT_REPOSITORY https://github.com/ThrowTheSwitch/CException.git
GIT_TAG v1.3.3)
FetchContent_MakeAvailable(cexception)
add_library(CException__impl ${cexception_SOURCE_DIR}/lib/CException.c)
add_library(CException__hdrs INTERFACE)
target_include_directories(CException__hdrs
INTERFACE ${cexception_SOURCE_DIR}/lib/)
add_library(CException INTERFACE)
target_link_libraries(CException INTERFACE CException__hdrs CException__impl)
endfunction()

function(add_unity)
FetchContent_Declare(
unity
GIT_REPOSITORY https://github.com/ThrowTheSwitch/Unity.git
GIT_TAG v2.5.2
OVERRIDE_FIND_PACKAGE
)
FetchContent_MakeAvailable(unity)
find_package(unity)
FetchContent_Declare(
unity
GIT_REPOSITORY https://github.com/ThrowTheSwitch/Unity.git
GIT_TAG v2.5.2
OVERRIDE_FIND_PACKAGE)
FetchContent_MakeAvailable(unity)
find_package(unity)
endfunction()

function(add_runtime_c)
FetchContent_Declare(
elastic_ai_runtime_c
GIT_REPOSITORY https://github.com/es-ude/elastic-ai.runtime.c.git
GIT_TAG v2.7.2
)
FetchContent_MakeAvailable(elastic_ai_runtime_c)
if (NOT topicMatcher__hdrs)
add_library( topicMatcher__hdrs INTERFACE)
target_include_directories(topicMatcher__hdrs INTERFACE
$<TARGET_PROPERTY:topicMatcher,INTERFACE_INCLUDE_DIRECTORIES>
)
endif ()

if (NOT protocol__hdrs)
add_library( protocol__hdrs INTERFACE)
target_include_directories(protocol__hdrs INTERFACE
$<TARGET_PROPERTY:protocol,INTERFACE_INCLUDE_DIRECTORIES>
)
endif ()

function(make_impl target)
if (NOT TARGET ${target}__impl)
add_library(${target}__impl INTERFACE)
target_link_libraries(${target}__impl INTERFACE
${target}
)
endif ()
endfunction()

make_impl(protocol)
make_impl(topicMatcher)
add_library(RuntimeC::Protocol ALIAS protocol__impl)
add_library(RuntimeC::Protocol__impl ALIAS protocol__impl)
add_library(RuntimeC::Protocol__hdrs ALIAS protocol__hdrs)
add_library(RuntimeC::TopicMatcher ALIAS topicMatcher__impl)
add_library(RuntimeC::TopicMatcher__hdrs ALIAS topicMatcher__hdrs)
add_library(RuntimeC::TopicMatcher__impl ALIAS topicMatcher__impl)
FetchContent_Declare(
elastic_ai_runtime_c
GIT_REPOSITORY https://github.com/es-ude/elastic-ai.runtime.c.git
GIT_TAG v2.7.2)
FetchContent_MakeAvailable(elastic_ai_runtime_c)
if(NOT topicMatcher__hdrs)
add_library(topicMatcher__hdrs INTERFACE)
target_include_directories(
topicMatcher__hdrs
INTERFACE $<TARGET_PROPERTY:topicMatcher,INTERFACE_INCLUDE_DIRECTORIES>)
endif()

if(NOT protocol__hdrs)
add_library(protocol__hdrs INTERFACE)
target_include_directories(
protocol__hdrs
INTERFACE $<TARGET_PROPERTY:protocol,INTERFACE_INCLUDE_DIRECTORIES>)
endif()

function(make_impl target)
if(NOT TARGET ${target}__impl)
add_library(${target}__impl INTERFACE)
target_link_libraries(${target}__impl INTERFACE ${target})
endif()
endfunction()

make_impl(protocol)
make_impl(topicMatcher)
add_library(RuntimeC::Protocol ALIAS protocol__impl)
add_library(RuntimeC::Protocol__impl ALIAS protocol__impl)
add_library(RuntimeC::Protocol__hdrs ALIAS protocol__hdrs)
add_library(RuntimeC::TopicMatcher ALIAS topicMatcher__impl)
add_library(RuntimeC::TopicMatcher__hdrs ALIAS topicMatcher__hdrs)
add_library(RuntimeC::TopicMatcher__impl ALIAS topicMatcher__impl)
endfunction()

function(add_freertos)
FetchContent_Declare(
freertos_kernel
GIT_REPOSITORY https://github.com/FreeRTOS/FreeRTOS-Kernel.git
GIT_TAG V11.0.1
)
FetchContent_Populate(freertos_kernel)
add_subdirectory(${freertos_kernel_SOURCE_DIR}/portable/ThirdParty/GCC/RP2040 FREERTOS_KERNEL)

add_library(__freertos_kernel__hdrs INTERFACE)
target_include_directories(__freertos_kernel__hdrs INTERFACE $<TARGET_PROPERTY:FreeRTOS-Kernel,INTERFACE_INCLUDE_DIRECTORIES>)
add_library(freeRtos::FreeRTOS-Kernel__hdrs ALIAS __freertos_kernel__hdrs)

add_library(freeRtos::FreeRTOS-Kernel ALIAS FreeRTOS-Kernel)
add_library(freeRtos::FreeRTOS-Kernel__impl ALIAS FreeRTOS-Kernel)


add_library(__freertos_kernel_heap__hdrs INTERFACE)
target_include_directories(__freertos_kernel_heap__hdrs INTERFACE $<TARGET_PROPERTY:FreeRTOS-Kernel-Heap3,INTERFACE_INCLUDE_DIRECTORIES>)
add_library(freeRtos::FreeRTOS-Kernel-Heap3__hdrs ALIAS __freertos_kernel_heap__hdrs)

add_library(freeRtos::FreeRTOS-Kernel-Heap3 ALIAS FreeRTOS-Kernel-Heap3)
add_library(freeRtos::FreeRTOS-Kernel-Heap3__impl ALIAS FreeRTOS-Kernel-Heap3)
FetchContent_Declare(
freertos_kernel
GIT_REPOSITORY https://github.com/FreeRTOS/FreeRTOS-Kernel.git
GIT_TAG V11.0.1
SOURCE_SUBDIR portable/ThirdParty/GCC/RP2040)
FetchContent_MakeAvailable(freertos_kernel)

add_library(__freertos_kernel__hdrs INTERFACE)
target_include_directories(
__freertos_kernel__hdrs
INTERFACE $<TARGET_PROPERTY:FreeRTOS-Kernel,INTERFACE_INCLUDE_DIRECTORIES>)
add_library(freeRtos::FreeRTOS-Kernel__hdrs ALIAS __freertos_kernel__hdrs)

add_library(freeRtos::FreeRTOS-Kernel ALIAS FreeRTOS-Kernel)
add_library(freeRtos::FreeRTOS-Kernel__impl ALIAS FreeRTOS-Kernel)

add_library(__freertos_kernel_heap__hdrs INTERFACE)
target_include_directories(
__freertos_kernel_heap__hdrs
INTERFACE
$<TARGET_PROPERTY:FreeRTOS-Kernel-Heap3,INTERFACE_INCLUDE_DIRECTORIES>)
add_library(freeRtos::FreeRTOS-Kernel-Heap3__hdrs ALIAS
__freertos_kernel_heap__hdrs)

add_library(freeRtos::FreeRTOS-Kernel-Heap3 ALIAS FreeRTOS-Kernel-Heap3)
add_library(freeRtos::FreeRTOS-Kernel-Heap3__impl ALIAS FreeRTOS-Kernel-Heap3)
endfunction()

84 changes: 0 additions & 84 deletions pico_sdk_import.cmake
View file

This file was deleted.

38 changes: 17 additions & 21 deletions src/sensor/bmi323/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -1,36 +1,32 @@
include(FetchContent)

FetchContent_Declare(
bmi323
GIT_REPOSITORY https://github.com/boschsensortec/BMI323_SensorAPI.git
GIT_TAG v2.1.0
)
FetchContent_Populate(bmi323)

add_library(external_bmi323_bosch_lib
"${bmi323_SOURCE_DIR}/bmi3.c"
"${bmi323_SOURCE_DIR}/bmi323.c")

target_include_directories(external_bmi323_bosch_lib PUBLIC "${bmi323_SOURCE_DIR}")
bmi323
GIT_REPOSITORY https://github.com/boschsensortec/BMI323_SensorAPI.git
GIT_TAG v2.1.0)
FetchContent_MakeAvailable(bmi323)

add_library(external_bmi323_bosch_lib "${bmi323_SOURCE_DIR}/bmi3.c"
"${bmi323_SOURCE_DIR}/bmi323.c")

target_include_directories(external_bmi323_bosch_lib
PUBLIC "${bmi323_SOURCE_DIR}")

if(BUILDING_FOR_ELASTIC_NODE)
add_library(Bmi323 Bmi323.c)
target_include_directories(Bmi323 PUBLIC include)
target_link_libraries(Bmi323 PRIVATE
external_bmi323_bosch_lib
add_library(Bmi323 Bmi323.c)
target_include_directories(Bmi323 PUBLIC include)
target_link_libraries(
Bmi323
PRIVATE external_bmi323_bosch_lib
Common
Pico::pico_stdlib
CException
Sleep
Gpio
Spi
)
Spi)
else()
add_library(Bmi323 INTERFACE)
target_include_directories(Bmi323 INTERFACE include)
endif ()
add_library(Bmi323 INTERFACE)
target_include_directories(Bmi323 INTERFACE include)
endif()

target_link_libraries(Bmi323 INTERFACE external_bmi323_bosch_lib)

0 comments on commit 36afabe

Please sign in to comment.