Skip to content

Commit

Permalink
Fix git_describe massaging (#35)
Browse files Browse the repository at this point in the history
  • Loading branch information
tomsci authored May 4, 2022
1 parent 78fb822 commit 343c2de
Showing 1 changed file with 2 additions and 8 deletions.
10 changes: 2 additions & 8 deletions tildamk6/mpconfigboard.cmake
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
set(IDF_TARGET esp32s3)

git_describe("TIDAL_GIT_VERSION" "${MICROPY_PORT_DIR}/../../../")
if(TIDAL_GIT_VERSION MATCHES "\\-dirty$")
# Our build process always dirties submodules, so it's not worth stating
# (And it's easier to strip here than fork git_describe())
string(LENGTH "${TIDAL_GIT_VERSION}" strlen)
math(EXPR strlen "${strlen} - 7")
string(SUBSTRING "${TIDAL_GIT_VERSION}" 0 ${strlen} TIDAL_GIT_VERSION)
endif()
# Override the --dirty set by git_describe, because our build process always dirties submodules so it's not worth remarking on
git_describe("TIDAL_GIT_VERSION" "${MICROPY_PORT_DIR}/../../../" --dirty=)
message("TIDAL_GIT_VERSION=${TIDAL_GIT_VERSION}")
configure_file("${MICROPY_PORT_DIR}/boards/tildamk6/sdkconfig.project_ver.in" "${MICROPY_PORT_DIR}/build-tildamk6/sdkconfig.project_ver")
if(DEFINED ENV{CONFIG_TIDAL_VARIANT_DEVBOARD})
Expand Down

0 comments on commit 343c2de

Please sign in to comment.