cleaned CMakeLists.txt, removed .elf from elf file (now is without extension), select debug or release from command line, updated readme

Author: pavelrevak

CMakeLists.txt

@@ -1,49 +1,33 @@
 cmake_minimum_required(VERSION 3.0)
 
 # project name
-project(bare_metal)
+project(baremetal)
 
 # select linker script
 set(LINKER_SCRIPT "ld/stm32f031x6.ld")
 
+# optimizations (-O0 -O1 -O2 -O3 -Os -Ofast -Og -flto)
+set(CMAKE_C_FLAGS_DEBUG "-Og -g -DDEBUG")
+set(CMAKE_CXX_FLAGS_DEBUG "-Og -g")
+set(CMAKE_C_FLAGS_RELEASE "-Os -flto")
+set(CMAKE_CXX_FLAGS_RELEASE "-Os -flto")
+
 add_compile_options(
+    -mthumb -mcpu=cortex-m0  # define CPU type
+    $<$<COMPILE_LANGUAGE:C>:-std=c11>
+    $<$<COMPILE_LANGUAGE:CXX>:-std=c++14>
+    $<$<COMPILE_LANGUAGE:CXX>:-fms-extensions>
+    $<$<COMPILE_LANGUAGE:CXX>:-fno-exceptions>
+    $<$<COMPILE_LANGUAGE:CXX>:-fno-rtti>
+    $<$<COMPILE_LANGUAGE:CXX>:-fno-use-cxa-atexit>
+    $<$<COMPILE_LANGUAGE:CXX>:-fno-threadsafe-statics>
     -Wall
     -pedantic
     -Wextra
     -fstrict-volatile-bitfields
     -ffunction-sections
 )
 
-# define compiler options more info in: gcc-arm directory: share/doc/gcc-arm-none-eabi/readme.txt
-set(CPU_OPTIONS "${CPU_OPTIONS} -mthumb -mcpu=cortex-m0")
-
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CPU_OPTIONS}")
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11")
-
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CPU_OPTIONS}")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fms-extensions")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-use-cxa-atexit")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-threadsafe-statics")
-
-set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -T ${LINKER_SCRIPT}")
-set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -nostartfiles")
-# set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -nostdlib")
-
-# optimizations (-O0 -O1 -O2 -O3 -Os -Ofast -Og -flto)
-set(OPTIMIZATION_DEBUG "-Og")
-set(OPTIMIZATION_RELEASE "-O2 -flto")
-
-set(CMAKE_C_FLAGS_DEBUG "${OPTIMIZATION_DEBUG} -g -DDEBUG")
-set(CMAKE_CXX_FLAGS_DEBUG "${OPTIMIZATION_DEBUG} -g -DDEBUG")
-set(CMAKE_C_FLAGS_RELEASE "${OPTIMIZATION_RELEASE}")
-set(CMAKE_CXX_FLAGS_RELEASE "${OPTIMIZATION_RELEASE}")
-
-# select build type, can be Debug, Release
-set(CMAKE_BUILD_TYPE Debug)
-
 include_directories(
     ${CMAKE_SOURCE_DIR}
 )
@@ -53,13 +37,19 @@ link_directories(
 )
 
 # list of modules to build final firmware (without extension .c or .cpp)
-add_executable(${PROJECT_NAME}.elf
+add_executable(${PROJECT_NAME}
     src/main
     src/startup/startup
     src/startup/stack
     src/startup/handlers_cm
 )
 
-set_target_properties(${PROJECT_NAME}.elf PROPERTIES LINK_DEPENDS ${CMAKE_SOURCE_DIR}/${LINKER_SCRIPT})
+target_link_libraries(${PROJECT_NAME}
+    -T${LINKER_SCRIPT}
+    -nostartfiles
+    # -nostdlib
+)
+
+set_property(TARGET ${PROJECT_NAME} PROPERTY LINK_DEPENDS ${CMAKE_SOURCE_DIR}/${LINKER_SCRIPT})
 
 include("cmake/flash.cmake")

README.md

@@ -36,11 +36,13 @@ Presented example is very simple "Hello blinky" program for STM32F0xx which blin
 ```
 mkdir _build
 cd _build
-cmake -D CMAKE_TOOLCHAIN_FILE=../cmake/arm-none-eabi.cmake ..
+cmake -D CMAKE_TOOLCHAIN_FILE=../cmake/arm-none-eabi.cmake -D CMAKE_BUILD_TYPE=Release ..
 make
 ```
 
-or use `make bin`, `srec`, `hex`, `flash`, ...
+change `CMAKE_BUILD_TYPE=Debug` to build debug version.
+
+You can use also `make bin`, `srec`, `hex`, `flash`, ...
 
 ## Change architecture
 

cmake/flash.cmake

@@ -1,24 +1,24 @@
 # cmake script for generating binary and hex format and for flashing
 
 add_custom_command(OUTPUT ${PROJECT_NAME}.srec
-    DEPENDS ${PROJECT_NAME}.elf
-    COMMAND ${CMAKE_OBJCOPY} -Osrec ${PROJECT_NAME}.elf ${PROJECT_NAME}.srec
+    DEPENDS ${PROJECT_NAME}
+    COMMAND ${CMAKE_OBJCOPY} -Osrec ${PROJECT_NAME} ${PROJECT_NAME}.srec
 )
 add_custom_command(OUTPUT ${PROJECT_NAME}.hex
-    DEPENDS ${PROJECT_NAME}.elf
-    COMMAND ${CMAKE_OBJCOPY} -Oihex ${PROJECT_NAME}.elf ${PROJECT_NAME}.hex
+    DEPENDS ${PROJECT_NAME}
+    COMMAND ${CMAKE_OBJCOPY} -Oihex ${PROJECT_NAME} ${PROJECT_NAME}.hex
 )
 add_custom_command(OUTPUT ${PROJECT_NAME}.bin
-    DEPENDS ${PROJECT_NAME}.elf
-    COMMAND ${CMAKE_OBJCOPY} -Obinary ${PROJECT_NAME}.elf ${PROJECT_NAME}.bin
+    DEPENDS ${PROJECT_NAME}
+    COMMAND ${CMAKE_OBJCOPY} -Obinary ${PROJECT_NAME} ${PROJECT_NAME}.bin
 )
 add_custom_command(OUTPUT ${PROJECT_NAME}.lst
-    DEPENDS ${PROJECT_NAME}.elf
-    COMMAND ${CMAKE_OBJDUMP} -S ${PROJECT_NAME}.elf > ${PROJECT_NAME}.lst
+    DEPENDS ${PROJECT_NAME}
+    COMMAND ${CMAKE_OBJDUMP} -S ${PROJECT_NAME} > ${PROJECT_NAME}.lst
 )
 add_custom_command(OUTPUT ${PROJECT_NAME}.sym
-    DEPENDS ${PROJECT_NAME}.elf
-    COMMAND ${CMAKE_NM} -C -l -n -S ${PROJECT_NAME}.elf > ${PROJECT_NAME}.sym
+    DEPENDS ${PROJECT_NAME}
+    COMMAND ${CMAKE_NM} -C -l -n -S ${PROJECT_NAME} > ${PROJECT_NAME}.sym
 )
 
 add_custom_target(srec