Skip to content

Commit 15cad97

Browse files
committed
XXX 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.
1 parent 6eb9b18 commit 15cad97

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
@@ -612,9 +612,9 @@ AC_CONFIG_FILES([
612612

613613
# Pass version number into avrdude.conf
614614
AS_VAR_IF([GIT_COMMIT_HASH], [], [dnl
615-
AVRDUDE_FULL_VERSION="$PACKAGE_VERSION"
615+
AVRDUDE_FULL_VERSION="$PACKAGE_VERSION am"
616616
], [dnl
617-
AVRDUDE_FULL_VERSION="$PACKAGE_VERSION ($GIT_COMMIT_HASH)"
617+
AVRDUDE_FULL_VERSION="$PACKAGE_VERSION ($GIT_COMMIT_HASH) am"
618618
])
619619
AC_DEFINE_UNQUOTED([AVRDUDE_FULL_VERSION], ["$AVRDUDE_FULL_VERSION"],
620620
[The full avrdude version as displayed in -? and avrdude.conf])

0 commit comments

Comments
 (0)