Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/cmake refactorings #14

Merged
merged 2 commits into from
Sep 28, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 1 addition & 11 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,7 @@ project(hal_st LANGUAGES C CXX VERSION 1.0.0)
option(HALST_INCLUDE_DEFAULT_INIT "Include default initialization code; turn off when providing custom initialization" ON)
option(HALST_INCLUDE_DEFAULT_LINKER_SCRIPTS "Include default memory-layout and sections linker scripts; turn off when providing custom linker scripts" ON)

include(FetchContent)

FetchContent_Declare(
emil
GIT_REPOSITORY https://github.com/philips-software/embeddedinfralib
GIT_TAG modern-cmake
)

FetchContent_MakeAvailable(emil)

list(APPEND CMAKE_MODULE_PATH "${emil_SOURCE_DIR}/external/xslt")
list(APPEND CMAKE_MODULE_PATH "${EMIL_SOURCE_DIR}/external/xslt")

set_directory_properties(PROPERTY USE_FOLDERS ON)

Expand Down
2 changes: 1 addition & 1 deletion hal_st/middlewares/STM32_WPAN/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
if (${TARGET_MCU_VENDOR} STREQUAL st AND "${TARGET_MCU_FAMILY}" STREQUAL stm32wbxx)
if ("${TARGET_MCU_VENDOR}" STREQUAL st AND "${TARGET_MCU_FAMILY}" STREQUAL stm32wbxx)

add_library(hal_st.stm32_wpan EXCLUDE_FROM_ALL STATIC)
install(TARGETS hal_st.stm32_wpan EXPORT halStTargets)
Expand Down
2 changes: 1 addition & 1 deletion hal_st/middlewares/ble_middleware/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
if (${TARGET_MCU_VENDOR} STREQUAL st AND "${TARGET_MCU_FAMILY}" STREQUAL stm32wbxx)
if ("${TARGET_MCU_VENDOR}" STREQUAL st AND "${TARGET_MCU_FAMILY}" STREQUAL stm32wbxx)

add_library(hal_st.ble_middleware EXCLUDE_FROM_ALL STATIC)
install(TARGETS hal_st.ble_middleware EXPORT halStTargets)
Expand Down
2 changes: 1 addition & 1 deletion hal_st/stm32fxxx/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ target_sources(hal_st.stm32fxxx PRIVATE
$<$<NOT:$<STREQUAL:${TARGET_MCU},stm32wb55>>:WatchDogStm.hpp>
)

if (${TARGET_MCU_VENDOR} STREQUAL st)
if ("${TARGET_MCU_VENDOR}" STREQUAL st)
if (${TARGET_MCU} STREQUAL stm32f372)
set(gpio_xml "${CMAKE_CURRENT_SOURCE_DIR}/ip/GPIO-STM32F373_gpio_v1_0_Modes.xml")
set(mcu_xml "${CMAKE_CURRENT_SOURCE_DIR}/mcu/STM32F373C(8-B-C)Tx.xml")
Expand Down