diff --git a/cmake/generate_version_file.cmake b/cmake/generate_version_file.cmake index ff7eab9b..d8366073 100644 --- a/cmake/generate_version_file.cmake +++ b/cmake/generate_version_file.cmake @@ -2,8 +2,6 @@ if(NOT BDIR) set(BDIR ${CMAKE_CURRENT_BINARY_DIR}) endif() -find_package(Git REQUIRED) - if(GIT_FOUND AND EXISTS ${CMAKE_CURRENT_LIST_DIR}/../.git) execute_process(COMMAND git describe --tags --match "v[0-9]*" --long --dirty WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} OUTPUT_VARIABLE git_version_string) else() @@ -18,21 +16,11 @@ endif() string(REGEX REPLACE "^v([0-9]+)\\..*" "\\1" NGSOLVE_VERSION_MAJOR "${git_version_string}") string(REGEX REPLACE "^v[0-9]+\\.([0-9]+).*" "\\1" NGSOLVE_VERSION_MINOR "${git_version_string}") string(REGEX REPLACE "^v[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" NGSOLVE_VERSION_PATCH "${git_version_string}") -string(REGEX REPLACE "^v[0-9]+\\.[0-9]+\\.[0-9]+\\-([0-9]+).*" "\\1" NGSOLVE_VERSION_TWEAK "${git_version_string}") -string(REGEX REPLACE "^v[0-9]+\\.[0-9]+\\.[0-9]+\\-[0-9]+\\-([0-9a-z]+).*" "\\1" NGSOLVE_VERSION_HASH "${git_version_string}") set(NGSOLVE_VERSION_SHORT ${NGSOLVE_VERSION_MAJOR}.${NGSOLVE_VERSION_MINOR}.${NGSOLVE_VERSION_PATCH}) -set(NGSOLVE_VERSION_LONG ${NGSOLVE_VERSION_SHORT}-${NGSOLVE_VERSION_TWEAK}-${NGSOLVE_VERSION_HASH}) -if(NGSOLVE_VERSION_TWEAK) - # no release version - nightly build - set(NGSOLVE_VERSION ${NGSOLVE_VERSION_LONG}) -else() # TWEAK is 0 -> current version has a tag assigned set(NGSOLVE_VERSION ${NGSOLVE_VERSION_SHORT}) -endif() - -set(NGSOLVE_VERSION_LONG ${NGSOLVE_VERSION_SHORT}-${NGSOLVE_VERSION_TWEAK}-${NGSOLVE_VERSION_HASH}) set(version_file ${BDIR}/ngsolve_version.hpp) set(new_version_file_string "#define NGSOLVE_VERSION \"${NGSOLVE_VERSION}\"\n") diff --git a/cmake/resources/ngsolve.rc.template b/cmake/resources/ngsolve.rc.template index ca4dfb05..a8046127 100644 --- a/cmake/resources/ngsolve.rc.template +++ b/cmake/resources/ngsolve.rc.template @@ -35,8 +35,8 @@ LANGUAGE LANG_GERMAN, SUBLANG_GERMAN // VS_VERSION_INFO VERSIONINFO - FILEVERSION @NGSOLVE_VERSION_MAJOR@,@NGSOLVE_VERSION_MINOR@,@NGSOLVE_VERSION_PATCH@,@NGSOLVE_VERSION_TWEAK@ - PRODUCTVERSION @NGSOLVE_VERSION_MAJOR@,@NGSOLVE_VERSION_MINOR@,@NGSOLVE_VERSION_PATCH@,@NGSOLVE_VERSION_TWEAK@ + FILEVERSION @NGSOLVE_VERSION_MAJOR@,@NGSOLVE_VERSION_MINOR@,@NGSOLVE_VERSION_PATCH@ + PRODUCTVERSION @NGSOLVE_VERSION_MAJOR@,@NGSOLVE_VERSION_MINOR@,@NGSOLVE_VERSION_PATCH@ FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x3L