kopia lustrzana https://github.com/Qyon/STM32_RTTY
CMakeLists cleanup
rodzic
09f79f95d1
commit
ced02c8d02
|
@ -4,17 +4,17 @@ SET(CMAKE_SYSTEM_NAME "Generic")
|
||||||
SET(CMAKE_SYSTEM_VERSION 1)
|
SET(CMAKE_SYSTEM_VERSION 1)
|
||||||
|
|
||||||
|
|
||||||
if(UNIX)
|
if (UNIX)
|
||||||
set(TOOLCHAIN_DIR "/opt/gcc-arm-none-eabi-5_4-2016q3/bin/")
|
set(TOOLCHAIN_DIR "/opt/gcc-arm-none-eabi-5_4-2016q3/bin/")
|
||||||
# set(CMAKE_C_COMPILER "/opt/gcc-arm-none-eabi-5_4-2016q3/bin/arm-none-eabi-gcc")
|
# set(CMAKE_C_COMPILER "/opt/gcc-arm-none-eabi-5_4-2016q3/bin/arm-none-eabi-gcc")
|
||||||
# set(CMAKE_CXX_COMPILER "/opt/gcc-arm-none-eabi-5_4-2016q3/bin/arm-none-eabi-g++")
|
# set(CMAKE_CXX_COMPILER "/opt/gcc-arm-none-eabi-5_4-2016q3/bin/arm-none-eabi-g++")
|
||||||
CMAKE_FORCE_C_COMPILER(${TOOLCHAIN_DIR}/arm-none-eabi-gcc GNU)
|
CMAKE_FORCE_C_COMPILER(${TOOLCHAIN_DIR}/arm-none-eabi-gcc GNU)
|
||||||
CMAKE_FORCE_CXX_COMPILER(${TOOLCHAIN_DIR}/arm-none-eabi-g++ GNU)
|
CMAKE_FORCE_CXX_COMPILER(${TOOLCHAIN_DIR}/arm-none-eabi-g++ GNU)
|
||||||
else()
|
else ()
|
||||||
set(TOOLCHAIN_DIR "D:/Programy/GNU Tools ARM Embedded/5.4 2016q3/bin")
|
set(TOOLCHAIN_DIR "D:/Programy/GNU Tools ARM Embedded/5.4 2016q3/bin")
|
||||||
CMAKE_FORCE_C_COMPILER(${TOOLCHAIN_DIR}/arm-none-eabi-gcc.exe GNU)
|
CMAKE_FORCE_C_COMPILER(${TOOLCHAIN_DIR}/arm-none-eabi-gcc.exe GNU)
|
||||||
CMAKE_FORCE_CXX_COMPILER(${TOOLCHAIN_DIR}/arm-none-eabi-g++.exe GNU)
|
CMAKE_FORCE_CXX_COMPILER(${TOOLCHAIN_DIR}/arm-none-eabi-g++.exe GNU)
|
||||||
endif()
|
endif ()
|
||||||
|
|
||||||
project(RS41HUP C CXX)
|
project(RS41HUP C CXX)
|
||||||
|
|
||||||
|
@ -33,11 +33,7 @@ SET(CMAKE_EXE_LINKER_FLAGS "-Wl,-Map=${CMAKE_BINARY_DIR}/${PROJECT_NAME}.map -ls
|
||||||
file(GLOB_RECURSE USER_SOURCES "*.c")
|
file(GLOB_RECURSE USER_SOURCES "*.c")
|
||||||
file(GLOB_RECURSE USER_SOURCES_CXX "*.cpp")
|
file(GLOB_RECURSE USER_SOURCES_CXX "*.cpp")
|
||||||
file(GLOB_RECURSE USER_HEADERS "*.h")
|
file(GLOB_RECURSE USER_HEADERS "*.h")
|
||||||
#file(GLOB_RECURSE HAL_SOURCES "stm_lib/src/*.c")
|
|
||||||
|
|
||||||
#add_library(CMSIS
|
|
||||||
# cmsis_boot/system_stm32f10x.c
|
|
||||||
# cmsis_boot/startup/startup_stm32f10x_md_vl.c)
|
|
||||||
include_directories(cmsis
|
include_directories(cmsis
|
||||||
cmsis_boot
|
cmsis_boot
|
||||||
stm_lib/inc
|
stm_lib/inc
|
||||||
|
@ -45,8 +41,6 @@ include_directories(cmsis
|
||||||
|
|
||||||
add_executable(${PROJECT_NAME}.elf ${USER_SOURCES} ${USER_SOURCES_CXX} ${USER_HEADERS} ${HAL_SOURCES} ${LINKER_SCRIPT})
|
add_executable(${PROJECT_NAME}.elf ${USER_SOURCES} ${USER_SOURCES_CXX} ${USER_HEADERS} ${HAL_SOURCES} ${LINKER_SCRIPT})
|
||||||
|
|
||||||
#target_link_libraries(${PROJECT_NAME}.elf CMSIS)
|
|
||||||
|
|
||||||
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-Map=${CMAKE_BINARY_DIR}/${PROJECT_NAME}.map")
|
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-Map=${CMAKE_BINARY_DIR}/${PROJECT_NAME}.map")
|
||||||
set(HEX_FILE ${CMAKE_BINARY_DIR}/${PROJECT_NAME}.hex)
|
set(HEX_FILE ${CMAKE_BINARY_DIR}/${PROJECT_NAME}.hex)
|
||||||
set(BIN_FILE ${CMAKE_BINARY_DIR}/${PROJECT_NAME}.bin)
|
set(BIN_FILE ${CMAKE_BINARY_DIR}/${PROJECT_NAME}.bin)
|
||||||
|
@ -61,9 +55,9 @@ set(CMAKE_CXX_STANDARD 11)
|
||||||
add_custom_target(program
|
add_custom_target(program
|
||||||
DEPENDS ${PROJECT_NAME}.elf
|
DEPENDS ${PROJECT_NAME}.elf
|
||||||
|
|
||||||
if(UNIX)
|
if (UNIX)
|
||||||
#TODO
|
#TODO
|
||||||
else()
|
else ()
|
||||||
COMMAND D:/Programy/stlink-1.3.0-win64/bin/st-flash --reset write ${BIN_FILE} 0x08000000
|
COMMAND D:/Programy/stlink-1.3.0-win64/bin/st-flash --reset write ${BIN_FILE} 0x08000000
|
||||||
endif()
|
endif ()
|
||||||
COMMENT "flashing ${BIN_FILE}")
|
COMMENT "flashing ${BIN_FILE}")
|
||||||
|
|
Ładowanie…
Reference in New Issue