Merge pull request #1191 from greatscottgadgets/release

set version to 2022.09.1
This commit is contained in:
Michael Ossmann
2022-09-29 07:12:06 -04:00
committed by GitHub
2 changed files with 2 additions and 5 deletions

View File

@ -52,7 +52,6 @@ ExternalProject_Add(libopencm3_${PROJECT_NAME}
INSTALL_COMMAND "" INSTALL_COMMAND ""
) )
#set(VERSION "")
if (NOT DEFINED VERSION) if (NOT DEFINED VERSION)
execute_process( execute_process(
COMMAND git log -n 1 --format=%h COMMAND git log -n 1 --format=%h
@ -63,7 +62,7 @@ if (NOT DEFINED VERSION)
OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_STRIP_TRAILING_WHITESPACE
) )
if (GIT_VERSION_FOUND) if (GIT_VERSION_FOUND)
set(VERSION "unknown") set(VERSION "2022.09.1")
else (GIT_VERSION_FOUND) else (GIT_VERSION_FOUND)
set(VERSION "git-${GIT_VERSION}") set(VERSION "git-${GIT_VERSION}")
endif (GIT_VERSION_FOUND) endif (GIT_VERSION_FOUND)

View File

@ -1,5 +1,3 @@
#set(RELEASE "")
if(NOT DEFINED RELEASE) if(NOT DEFINED RELEASE)
execute_process( execute_process(
COMMAND git log -n 1 --format=%h COMMAND git log -n 1 --format=%h
@ -10,7 +8,7 @@ if(NOT DEFINED RELEASE)
OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_STRIP_TRAILING_WHITESPACE
) )
if (GIT_EXIT_VALUE) if (GIT_EXIT_VALUE)
set(RELEASE "unknown") set(RELEASE "2022.09.1")
else (GIT_EXIT_VALUE) else (GIT_EXIT_VALUE)
execute_process( execute_process(
COMMAND git status -s --untracked-files=no COMMAND git status -s --untracked-files=no