From 99faf57b4296b032e486cbf3829745cbcb14a80b Mon Sep 17 00:00:00 2001 From: Trygve Laugstøl Date: Wed, 25 Jan 2017 22:33:54 +0100 Subject: o Using upstream's tinyprintf which requires 64-bit math operations, so add gcc as a required library. --- .gitignore | 1 + apps/can1/CMakeLists.txt | 2 +- apps/cpp1/CMakeLists.txt | 2 +- apps/dma1/CMakeLists.txt | 2 +- apps/i2c1/CMakeLists.txt | 2 ++ apps/os1/CMakeLists.txt | 2 +- apps/os2/CMakeLists.txt | 2 +- apps/serial1/CMakeLists.txt | 2 ++ apps/serial2/CMakeLists.txt | 2 +- apps/stepper1/CMakeLists.txt | 2 +- apps/stepper2/CMakeLists.txt | 2 +- apps/usb1/CMakeLists.txt | 2 +- 12 files changed, 14 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 0dc2ce5..49cbe99 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ .idea build .gdb_history +cmake-build-* diff --git a/apps/can1/CMakeLists.txt b/apps/can1/CMakeLists.txt index 20ebd0d..48bacdd 100644 --- a/apps/can1/CMakeLists.txt +++ b/apps/can1/CMakeLists.txt @@ -10,7 +10,7 @@ add_executable(can1.elf can1.cpp ${STM32F10X_STDPERIPH_LIB}/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_can.c ${STM32F10X_STDPERIPH_LIB}/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_gpio.c ) -target_link_libraries(can1.elf tinyprintf) +target_link_libraries(can1.elf tinyprintf gcc) target_include_directories(can1.elf PUBLIC ${PLAYGROUND_DIR}/include diff --git a/apps/cpp1/CMakeLists.txt b/apps/cpp1/CMakeLists.txt index 2580535..381fd73 100644 --- a/apps/cpp1/CMakeLists.txt +++ b/apps/cpp1/CMakeLists.txt @@ -13,7 +13,7 @@ target_include_directories(cpp1.elf PUBLIC $ ) target_compile_definitions(cpp1.elf PUBLIC ${STM32F10X_STDPERIPH_DEFINES}) -target_link_libraries(cpp1.elf tinyprintf) +target_link_libraries(cpp1.elf tinyprintf gcc) set_target_properties(cpp1.elf PROPERTIES LINK_FLAGS "-nostartfiles -T${CMAKE_SOURCE_DIR}/cmake/stm32.ld") add_extra_commands(cpp1.elf) diff --git a/apps/dma1/CMakeLists.txt b/apps/dma1/CMakeLists.txt index 19321d8..008982d 100644 --- a/apps/dma1/CMakeLists.txt +++ b/apps/dma1/CMakeLists.txt @@ -13,7 +13,7 @@ target_include_directories(dma1.elf PUBLIC $ ) target_compile_definitions(dma1.elf PUBLIC ${DEFINES_FROM_MCU_STM32}) -target_link_libraries(dma1.elf tinyprintf) +target_link_libraries(dma1.elf tinyprintf gcc) target_link_libraries(dma1.elf dma1-mcu-stm32) set_target_properties(dma1.elf PROPERTIES LINK_FLAGS "-nostartfiles -T${CMAKE_SOURCE_DIR}/cmake/stm32.ld") diff --git a/apps/i2c1/CMakeLists.txt b/apps/i2c1/CMakeLists.txt index 67139f8..e148c41 100644 --- a/apps/i2c1/CMakeLists.txt +++ b/apps/i2c1/CMakeLists.txt @@ -20,6 +20,8 @@ target_include_directories(i2c1.elf PUBLIC ${STM32F10X_STDPERIPH_LIB}/Libraries/STM32F10x_StdPeriph_Driver/inc) target_compile_definitions(i2c1.elf PUBLIC ${STM32F10X_STDPERIPH_DEFINES} USE_FULL_ASSERT) +target_link_libraries(i2c1.elf gcc) + set_target_properties(i2c1.elf PROPERTIES O_LEVEL 3) #set_source_files_properties(i2c1.cpp PROPERTIES O_LEVEL s) diff --git a/apps/os1/CMakeLists.txt b/apps/os1/CMakeLists.txt index b6849b7..f27c6de 100644 --- a/apps/os1/CMakeLists.txt +++ b/apps/os1/CMakeLists.txt @@ -10,7 +10,7 @@ add_executable(os1.elf os1.cpp os1_cm3.s ${STM32F10X_STDPERIPH_LIB}/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_usart.c ${STM32F10X_STDPERIPH_LIB}/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_gpio.c ) -target_link_libraries(os1.elf tinyprintf) +target_link_libraries(os1.elf tinyprintf gcc) target_include_directories(os1.elf PUBLIC ${PLAYGROUND_DIR}/include diff --git a/apps/os2/CMakeLists.txt b/apps/os2/CMakeLists.txt index 6db926d..61be611 100644 --- a/apps/os2/CMakeLists.txt +++ b/apps/os2/CMakeLists.txt @@ -10,7 +10,7 @@ add_executable(os2.elf os2.cpp os2_cm3.s ${STM32F10X_STDPERIPH_LIB}/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_usart.c ${STM32F10X_STDPERIPH_LIB}/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_gpio.c ) -target_link_libraries(os2.elf tinyprintf) +target_link_libraries(os2.elf tinyprintf gcc) target_include_directories(os2.elf PUBLIC ${PLAYGROUND_DIR}/include diff --git a/apps/serial1/CMakeLists.txt b/apps/serial1/CMakeLists.txt index 0491391..cc336b2 100644 --- a/apps/serial1/CMakeLists.txt +++ b/apps/serial1/CMakeLists.txt @@ -11,6 +11,8 @@ add_executable(serial1.elf serial1.cpp ${STM32F10X_STDPERIPH_LIB}/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_gpio.c ) +target_link_libraries(serial1.elf gcc) + target_include_directories(serial1.elf PUBLIC ${PLAYGROUND_DIR}/include ${TINYPRINTF_DIR} diff --git a/apps/serial2/CMakeLists.txt b/apps/serial2/CMakeLists.txt index 3c31c50..3914115 100644 --- a/apps/serial2/CMakeLists.txt +++ b/apps/serial2/CMakeLists.txt @@ -10,7 +10,7 @@ add_executable(serial2.elf serial2.cpp ${STM32F10X_STDPERIPH_LIB}/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_usart.c ${STM32F10X_STDPERIPH_LIB}/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_gpio.c ) -target_link_libraries(serial2.elf tinyprintf) +target_link_libraries(serial2.elf tinyprintf gcc) target_include_directories(serial2.elf PUBLIC ${PLAYGROUND_DIR}/include diff --git a/apps/stepper1/CMakeLists.txt b/apps/stepper1/CMakeLists.txt index e09a093..77a7972 100644 --- a/apps/stepper1/CMakeLists.txt +++ b/apps/stepper1/CMakeLists.txt @@ -13,7 +13,7 @@ target_include_directories(stepper1.elf PUBLIC $ ) target_compile_definitions(stepper1.elf PUBLIC ${STM32F10X_STDPERIPH_DEFINES}) -target_link_libraries(stepper1.elf tinyprintf) +target_link_libraries(stepper1.elf tinyprintf gcc) set_target_properties(stepper1.elf PROPERTIES LINK_FLAGS "-nostartfiles -T${CMAKE_SOURCE_DIR}/cmake/stm32.ld") add_extra_commands(stepper1.elf) diff --git a/apps/stepper2/CMakeLists.txt b/apps/stepper2/CMakeLists.txt index 928bbfd..14dbb45 100644 --- a/apps/stepper2/CMakeLists.txt +++ b/apps/stepper2/CMakeLists.txt @@ -15,7 +15,7 @@ target_include_directories(stepper2.elf PUBLIC $ ) target_compile_definitions(stepper2.elf PUBLIC ${STM32F10X_STDPERIPH_DEFINES}) -target_link_libraries(stepper2.elf tinyprintf m) +target_link_libraries(stepper2.elf tinyprintf m gcc) set_target_properties(stepper2.elf PROPERTIES LINK_FLAGS "-nostartfiles -T${CMAKE_SOURCE_DIR}/cmake/stm32.ld") add_extra_commands(stepper2.elf) diff --git a/apps/usb1/CMakeLists.txt b/apps/usb1/CMakeLists.txt index 568aff7..67785bc 100644 --- a/apps/usb1/CMakeLists.txt +++ b/apps/usb1/CMakeLists.txt @@ -13,7 +13,7 @@ target_include_directories(usb1.elf PUBLIC $ ) target_compile_definitions(usb1.elf PUBLIC ${DEFINES_FROM_MCU_STM32}) -target_link_libraries(usb1.elf tinyprintf) +target_link_libraries(usb1.elf tinyprintf gcc) target_link_libraries(usb1.elf usb1-mcu-stm32) set_target_properties(usb1.elf PROPERTIES LINK_FLAGS "-nostartfiles -T${CMAKE_SOURCE_DIR}/cmake/stm32.ld") -- cgit v1.2.3