diff --git a/CMakeLists.txt b/CMakeLists.txt index 8a0a48a..da3a60b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ set(CMAKE_C_COMPILER "/usr/bin/arm-none-eabi-gcc") set(CMAKE_CXX_COMPILER "/usr/bin/arm-none-eabi-g++") set(CMAKE_ASM_COMPILER "/usr/bin/arm-none-eabi-gcc") set(CMAKE_OBJCOPY "/usr/bin/arm-none-eabi-objcopy") -set(CMAKE_EXE_LINKER_FLAGS "--specs=nosys.specs") +set(CMAKE_EXE_LINKER_FLAGS "--specs=nosys.specs") #AS we provide our own linker nad not using the one from the curren OS (system) #################################################################################################### @@ -26,7 +26,7 @@ set(EXECUTABLE ${PROJECT_NAME}.out) #CONFIG FILE #################################################################################################### -include(bsl/nucleo_f042k6/bsl_nucleo_f042k6.cmake) +include(${CMAKE_SOURCE_DIR}/bsl/nucleo_f042k6/bsl_nucleo_f042k6.cmake) #################################################################################################### #SUBDIRECTORIES @@ -62,8 +62,9 @@ add_custom_command(TARGET ${EXECUTABLE} add_custom_command(TARGET ${EXECUTABLE} POST_BUILD - COMMAND arm-none-eabi-objcopy -O ihex ${EXECUTABLE} ${PROJECT_NAME}.hex - COMMAND arm-none-eabi-objcopy -O binary ${EXECUTABLE} ${PROJECT_NAME}.bin) + COMMAND ${CMAKE_OBJCOPY} -O ihex ${EXECUTABLE} ${PROJECT_NAME}.hex + COMMAND ${CMAKE_OBJCOPY} -O binary ${EXECUTABLE} ${PROJECT_NAME}.bin) + #################################################################################################### #CUSTOM Comments from dev. diff --git a/bsl/csl/CMakeLists.txt b/bsl/csl/CMakeLists.txt index 93f5fb6..35f66fd 100644 --- a/bsl/csl/CMakeLists.txt +++ b/bsl/csl/CMakeLists.txt @@ -1,3 +1,2 @@ project(Csl_Stm) - add_subdirectory(stm32f042) diff --git a/bsl/nucleo_f042k6/bsl_nucleo_f042k6.cmake b/bsl/nucleo_f042k6/bsl_nucleo_f042k6.cmake index 92b21b8..679c545 100644 --- a/bsl/nucleo_f042k6/bsl_nucleo_f042k6.cmake +++ b/bsl/nucleo_f042k6/bsl_nucleo_f042k6.cmake @@ -49,7 +49,7 @@ set(C_DEFS -DINSTRUCTION_CACHE_ENABLE=0 -DDATA_CACHE_ENABLE=0) -set (CPP_INCLUDES .) +set (CPP_INCLUDES ${CMAKE_SOURCE_DIR}) set (CPP_FLAGS ${C_FLAGS}) set (CPP_DEFS ${C_DEFS})