josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4710 from Tirpitz93/fix-dev-and-dirty-cmake 

Fix String substitution when `DEV` flavour is built dirty
This commit is contained in:
3d-gussner 2024-07-25 08:46:28 +02:00 committed by GitHub
parent 3722a17e5a 695ba5d5db
commit cea5f70974
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/GetGitRevisionDescription.cmake
View File

@ -240,7 +240,7 @@ function(git_describe_working_tree _var)
set(out "${out}-${res}-NOTFOUND") set(out "${out}-${res}-NOTFOUND")
endif() endif()
if( "${out}" MATCHES "-D\$") if( "${out}" MATCHES "-D\$")
STRING(REPLACE "-D" "-${COMMIT_COUNT}-D" out "${out}") STRING(REGEX REPLACE "-D\$" "-${COMMIT_COUNT}-D" out "${out}")
else() else()
set(out "${out}-${COMMIT_COUNT}") set(out "${out}-${COMMIT_COUNT}")
endif() endif()