diff options
| author | Daniel Agar <daniel@agar.ca> | 2015-04-18 00:57:26 -0400 |
|---|---|---|
| committer | Daniel Agar <daniel@agar.ca> | 2015-04-18 01:25:54 -0400 |
| commit | 207b57869d7ed44950a51bbd9632a8549d7a9c49 (patch) | |
| tree | 058febbd95ea40c7eb0ba2b926d9378cd7022d0d /src/modules/uavcan | |
| parent | b53a33bc513a33c784b37a700058bfbc1e15c985 (diff) | |
| download | px4-firmware-207b57869d7ed44950a51bbd9632a8549d7a9c49.tar.gz px4-firmware-207b57869d7ed44950a51bbd9632a8549d7a9c49.tar.bz2 px4-firmware-207b57869d7ed44950a51bbd9632a8549d7a9c49.zip | |
only define GIT_VERSION where it's used
-when the git revision is passed to every file as a define it causes
unnecessary ccache cache misses
Diffstat (limited to 'src/modules/uavcan')
| -rw-r--r-- | src/modules/uavcan/module.mk | 3 | ||||
| -rw-r--r-- | src/modules/uavcan/uavcan_main.cpp | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/modules/uavcan/module.mk b/src/modules/uavcan/module.mk index f7feeadab..437feb301 100644 --- a/src/modules/uavcan/module.mk +++ b/src/modules/uavcan/module.mk @@ -63,7 +63,8 @@ SRCS += $(subst $(PX4_MODULE_SRC),../../,$(LIBUAVCAN_SRC)) INCLUDE_DIRS += $(LIBUAVCAN_INC) # Since actual compiler mode is C++11, the library will default to UAVCAN_CPP11, but it will fail to compile # because this platform lacks most of the standard library and STL. Hence we need to force C++03 mode. -override EXTRADEFINES := $(EXTRADEFINES) -DUAVCAN_CPP_VERSION=UAVCAN_CPP03 -DUAVCAN_NO_ASSERTIONS +override EXTRADEFINES := $(EXTRADEFINES) -DGIT_VERSION='"$(GIT_DESC)"' -DUAVCAN_CPP_VERSION=UAVCAN_CPP03 -DUAVCAN_NO_ASSERTIONS + # # libuavcan drivers for STM32 diff --git a/src/modules/uavcan/uavcan_main.cpp b/src/modules/uavcan/uavcan_main.cpp index 02cde9656..2d5abf959 100644 --- a/src/modules/uavcan/uavcan_main.cpp +++ b/src/modules/uavcan/uavcan_main.cpp @@ -210,9 +210,9 @@ void UavcanNode::fill_node_info() /* software version */ uavcan::protocol::SoftwareVersion swver; - // Extracting the first 8 hex digits of FW_GIT and converting them to int + // Extracting the first 8 hex digits of GIT_VERSION and converting them to int char fw_git_short[9] = {}; - std::memmove(fw_git_short, FW_GIT, 8); + std::memmove(fw_git_short, GIT_VERSION, 8); assert(fw_git_short[8] == '\0'); char *end = nullptr; swver.vcs_commit = std::strtol(fw_git_short, &end, 16); |