From 930a60006a2742c406d1ca767bb8fd7e41ec5f3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alberto=20Garci=CC=81a=20Hierro?= Date: Fri, 4 Dec 2020 20:13:02 +0000 Subject: [PATCH] build: deduplicate version number Make the version in the CMakeLists.txt the canonical one. Instead of redefining it in version.h, use command line flags to pass -DFC_VERSION_{MAJOR,MINOR,PATCH_LEVEL} --- CMakeLists.txt | 6 ++++++ cmake/stm32.cmake | 2 +- src/main/build/version.h | 4 ---- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7facec247c..dc9a5385d3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,6 +58,12 @@ set(FIRMWARE_VERSION ${PROJECT_VERSION}) option(WARNINGS_AS_ERRORS "Make all warnings into errors") message("-- toolchain: ${TOOLCHAIN}, WARNINGS_AS_ERRORS: ${WARNINGS_AS_ERRORS}") +set(COMMON_COMPILE_DEFINITIONS + FC_VERSION_MAJOR=${CMAKE_PROJECT_VERSION_MAJOR} + FC_VERSION_MINOR=${CMAKE_PROJECT_VERSION_MINOR} + FC_VERSION_PATCH_LEVEL=${CMAKE_PROJECT_VERSION_PATCH} +) + include(settings) include(openocd) include(svd) diff --git a/cmake/stm32.cmake b/cmake/stm32.cmake index 0e39ea5905..ab29a524b8 100644 --- a/cmake/stm32.cmake +++ b/cmake/stm32.cmake @@ -304,7 +304,7 @@ function(target_stm32) set(target_include_directories ${args_INCLUDE_DIRECTORIES}) - set(target_definitions ${STM32_DEFINITIONS}) + set(target_definitions ${STM32_DEFINITIONS} ${COMMON_COMPILE_DEFINITIONS}) get_stm32_target_features(features "${CMAKE_CURRENT_SOURCE_DIR}" ${name}) set_property(TARGET ${elf_target} PROPERTY FEATURES ${features}) diff --git a/src/main/build/version.h b/src/main/build/version.h index 1e108f5a01..49ec81d1b1 100644 --- a/src/main/build/version.h +++ b/src/main/build/version.h @@ -15,10 +15,6 @@ * along with Cleanflight. If not, see . */ -#define FC_VERSION_MAJOR 2 // increment when a major release is made (big new feature, etc) -#define FC_VERSION_MINOR 7 // increment when a minor release is made (small new feature, change etc) -#define FC_VERSION_PATCH_LEVEL 0 // increment when a bug is fixed - #define STR_HELPER(x) #x #define STR(x) STR_HELPER(x) #define FC_VERSION_STRING STR(FC_VERSION_MAJOR) "." STR(FC_VERSION_MINOR) "." STR(FC_VERSION_PATCH_LEVEL)