Skip to content

Commit fcb6f74

Browse files
committed
Add buildsystem marker to AVRDUDE_FULL_VERSION
Add markers in the AVRDUDE_FULL_VERSION message to note the buildsystem used. Adds "cm" for cmake builds, and "am" for automake builds. We could also easily keep the cmake builds without such a marker, and only mark the automake builds.
1 parent 78006ac commit fcb6f74

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ include(FindPackageMessage)
4949
include(GNUInstallDirs)
5050

5151
set(CONFIG_DIR "${CMAKE_INSTALL_FULL_SYSCONFDIR}")
52-
set(AVRDUDE_FULL_VERSION ${CMAKE_PROJECT_VERSION})
52+
set(AVRDUDE_FULL_VERSION "${CMAKE_PROJECT_VERSION} cm")
5353

5454
# =====================================
5555
# Get Git commit info
@@ -91,7 +91,7 @@ if(Git_FOUND)
9191

9292
# If the commit is not tagged, include the date and commit hash in the full version string.
9393
if(NOT GIT_COMMIT_HASH STREQUAL GIT_TAG_HASH)
94-
set(AVRDUDE_FULL_VERSION "${CMAKE_PROJECT_VERSION}-${GIT_COMMIT_DATE} (${GIT_COMMIT_HASH})")
94+
set(AVRDUDE_FULL_VERSION "${CMAKE_PROJECT_VERSION}-${GIT_COMMIT_DATE} (${GIT_COMMIT_HASH}) cm")
9595
endif()
9696
endif()
9797

src/configure.ac

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -629,9 +629,9 @@ AC_CONFIG_FILES([
629629

630630
# Pass version info into avrdude.conf and "avrdude -?" version message
631631
if test "x$GIT_COMMIT_HASH" = "x$GIT_TAG_HASH"; then
632-
AVRDUDE_FULL_VERSION="$PACKAGE_VERSION"
632+
AVRDUDE_FULL_VERSION="$PACKAGE_VERSION am"
633633
else
634-
AVRDUDE_FULL_VERSION="$PACKAGE_VERSION ($GIT_COMMIT_HASH)"
634+
AVRDUDE_FULL_VERSION="$PACKAGE_VERSION ($GIT_COMMIT_HASH) am"
635635
fi
636636
AC_DEFINE_UNQUOTED([AVRDUDE_FULL_VERSION], ["$AVRDUDE_FULL_VERSION"],
637637
[The full avrdude version as displayed in -? and avrdude.conf])

0 commit comments

Comments
 (0)