From e13f0c00a6e547583791b7df81bc267e948d257b Mon Sep 17 00:00:00 2001 From: kerem Date: Sun, 18 Sep 2022 17:17:21 +0200 Subject: [PATCH] Started to port config.cmake to perferals to make the cmake more independent --- env/csl/stm32f042/Src/CMakeLists.txt | 5 ----- env/csl/stm32f042/config.cmake | 1 - env/periferals/CMakeLists.txt | 2 +- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/env/csl/stm32f042/Src/CMakeLists.txt b/env/csl/stm32f042/Src/CMakeLists.txt index 0fa8064..1712456 100644 --- a/env/csl/stm32f042/Src/CMakeLists.txt +++ b/env/csl/stm32f042/Src/CMakeLists.txt @@ -29,8 +29,3 @@ target_compile_definitions(stmTimer PRIVATE ${C_DEFS}) target_include_directories(stmTimer PUBLIC ${PERIFERALS_DIR} ${CSL_INCLUDES}) add_library(sub::timer ALIAS stmTimer) -add_library(stmSPI imp_spi.c) -target_compile_options(stmSPI PRIVATE ${C_FLAGS}) -target_compile_definitions(stmSPI PRIVATE ${C_DEFS}) -target_include_directories(stmSPI PUBLIC ${PERIFERALS_DIR} ${CSL_INCLUDES}) -add_library(sub::imp_spi ALIAS stmSPI) diff --git a/env/csl/stm32f042/config.cmake b/env/csl/stm32f042/config.cmake index c680610..45ac57b 100644 --- a/env/csl/stm32f042/config.cmake +++ b/env/csl/stm32f042/config.cmake @@ -75,6 +75,5 @@ list(APPEND EXTRA_LIBS sub::delay) list(APPEND EXTRA_LIBS sub::usart) list(APPEND EXTRA_LIBS sub::timer) list(APPEND EXTRA_LIBS sub::init) -list(APPEND EXTRA_LIBS sub::imp_spi) list(APPEND EXTRA_LIBS sub::spi) list(APPEND EXTRA_LIBS sub::pin) diff --git a/env/periferals/CMakeLists.txt b/env/periferals/CMakeLists.txt index d8eef73..6a98475 100644 --- a/env/periferals/CMakeLists.txt +++ b/env/periferals/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library(SPI spi.c) +add_library(SPI spi.c ${CSL_DIR}/Src/imp_spi.c) target_compile_options(SPI PRIVATE ${C_FLAGS}) target_compile_definitions(SPI PRIVATE ${C_DEFS}) target_include_directories(SPI PUBLIC ${PERIFERALS_DIR} ${CSL_INCLUDES})