From 81e0d54643a25ee2b0fc3fd83df702adfd19dd47 Mon Sep 17 00:00:00 2001
From: Sergi Hernandez Juan <shernand@iri.upc.edu>
Date: Sun, 9 Feb 2020 22:41:34 +0100
Subject: [PATCH] Added a variable qith the project configuration header.
Updated the path to STM32 HAL files.
---
CMakeLists.txt | 6 +++---
src/CMakeLists.txt | 5 +++--
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 81aee0d..f4d7ecc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -93,15 +93,15 @@ set(CMAKE_ASM_COMPILER arm-none-eabi-gcc)
# processor selection
set(TARGET_PROCESSOR STM32F103RE)
+ADD_SUBDIRECTORY(src)
+
# compiler settings
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mlittle-endian -mcpu=cortex-m3 -mthumb -mthumb-interwork -Wall -g -fno-common -msoft-float -ffreestanding -imacros ${CMAKE_CURRENT_SOURCE_DIR}/include/darwin_conf.h")
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mlittle-endian -mcpu=cortex-m3 -mthumb -mthumb-interwork -Wall -g -fno-common -msoft-float -ffreestanding -imacros ${configuration_file}")
# linker settings
set(LINKER_SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/linker_script/darwin.ld")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-Map=${PROJECT_NAME}.map,-cref -T ${LINKER_SCRIPT} --specs=nosys.specs")
-ADD_SUBDIRECTORY(src)
-
include_directories(${header_include_dir})
add_definitions(-DUSE_HAL_DRIVER)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7d3b817..7288e92 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -21,10 +21,11 @@ SET(sources ${CMAKE_CURRENT_SOURCE_DIR}/cm730_fw.c
#${CMAKE_CURRENT_SOURCE_DIR}/grippers.c
#${CMAKE_CURRENT_SOURCE_DIR}/smart_charger.c
#${CMAKE_CURRENT_SOURCE_DIR}/stairs.c
- ${CMAKE_CURRENT_SOURCE_DIR}/../stm32_libraries/f1/usart/src/usart3.c
- ${CMAKE_CURRENT_SOURCE_DIR}/../stm32_libraries/f1/usart/src/usart1.c PARENT_SCOPE)
+ ${PROJECT_SOURCE_DIR}/stm32_libraries/f1/usart/src/usart3.c
+ ${PROJECT_SOURCE_DIR}/stm32_libraries/f1/usart/src/usart1.c PARENT_SCOPE)
set(header_include_dir ${CMAKE_CURRENT_SOURCE_DIR}/../include ${CMAKE_CURRENT_SOURCE_DIR}/../stm32_libraries/f1/usart/include PARENT_SCOPE)
+set(configuration_file ${CMAKE_CURRENT_SOURCE_DIR}/../include/darwin_conf.h PARENT_SCOPE)
set(processor STM32F103xE PARENT_SCOPE)
set(system_freq 8000000 PARENT_SCOPE)
--
GitLab