diff options
Diffstat (limited to 'www/domoticz/files/patch-getgit.cmake')
| -rw-r--r-- | www/domoticz/files/patch-getgit.cmake | 73 |
1 files changed, 10 insertions, 63 deletions
diff --git a/www/domoticz/files/patch-getgit.cmake b/www/domoticz/files/patch-getgit.cmake index de00ad7ff588..7fcd6b4d29be 100644 --- a/www/domoticz/files/patch-getgit.cmake +++ b/www/domoticz/files/patch-getgit.cmake @@ -1,70 +1,17 @@ ---- getgit.cmake.orig 2018-06-23 14:18:06 UTC +--- getgit.cmake.orig 2020-05-24 12:30:37 UTC +++ getgit.cmake -@@ -1,66 +1,7 @@ - # this macro gets called as a custom build step by running make +@@ -2,10 +2,10 @@ # please take into account, that the variable 'SOURCE_DIR' has been defined by the caller --# the git.cmake module is part of the standard distribution + # the git.cmake module is part of the standard distribution -find_package(Git) -if(NOT GIT_FOUND) - MESSAGE(FATAL_ERROR "Git not found!.") -endif() -- --MACRO(Gitversion_GET_REVISION dir variable) -- EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} --git-dir ./.git rev-list HEAD --count -- WORKING_DIRECTORY ${dir} -- OUTPUT_VARIABLE ${variable} -- OUTPUT_STRIP_TRAILING_WHITESPACE) --ENDMACRO(Gitversion_GET_REVISION) -- --MACRO(Gitversion_GET_HASH dir variable) -- EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} --git-dir ./.git rev-parse --short HEAD -- WORKING_DIRECTORY ${dir} -- OUTPUT_VARIABLE ${variable} -- OUTPUT_STRIP_TRAILING_WHITESPACE) --ENDMACRO(Gitversion_GET_HASH) -- --MACRO(Gitversion_GET_DATE dir variable) -- EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} --git-dir ./.git show -s --format=%ct -- WORKING_DIRECTORY ${dir} -- OUTPUT_VARIABLE ${variable} -- OUTPUT_STRIP_TRAILING_WHITESPACE) --ENDMACRO(Gitversion_GET_DATE) -- --MACRO(Gitversion_CHECK_DIRTY dir variable) -- EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} --git-dir ./.git diff-index -m --name-only HEAD -- WORKING_DIRECTORY ${dir} -- OUTPUT_VARIABLE ${variable} -- OUTPUT_STRIP_TRAILING_WHITESPACE) --ENDMACRO(Gitversion_CHECK_DIRTY) -- --Gitversion_GET_REVISION("${SOURCE_DIR}" ProjectRevision) --IF(NOT ProjectRevision) -- MESSAGE(STATUS "Failed to get ProjectRevision from git, set it to 0") -- set (ProjectRevision 0) --ELSE(NOT ProjectRevision) -- MATH(EXPR ProjectRevision "${ProjectRevision}+2107") --ENDIF(NOT ProjectRevision) --Gitversion_GET_HASH("${SOURCE_DIR}" ProjectHash) --IF(NOT ProjectHash) -- MESSAGE(STATUS "Failed to get ProjectHash from git, set it to 0") -- set (ProjectHash 0) --ENDIF(NOT ProjectHash) --Gitversion_GET_DATE("${SOURCE_DIR}" ProjectDate) --IF(NOT ProjectDate) -- MESSAGE(STATUS "Failed to get ProjectDate from git, set it to 0") -- set (ProjectDate 0) --ENDIF(NOT ProjectDate) --Gitversion_CHECK_DIRTY("${SOURCE_DIR}" ProjectDirty) --IF(ProjectDirty) -- MESSAGE(STATUS "domoticz has been modified locally: adding \"-modified\" to hash") -- set (ProjectHash "${ProjectHash}-modified") --ENDIF(ProjectDirty) -- --# write a file with the APPVERSION define --file(WRITE ${SOURCE_DIR}/appversion.h.txt "#define APPVERSION ${ProjectRevision}\n#define APPHASH \"${ProjectHash}\"\n#define APPDATE ${ProjectDate}\n") -- -+set (ProjectDate 0) - # if ProjectDate is 0, create appversion.h.txt from a copy of appversion.default - IF(NOT ProjectDate AND EXISTS ${SOURCE_DIR}/appversion.default) - MESSAGE(STATUS "ProjectDate is 0 and appversion.default exists, copy it") ++#find_package(Git) ++#if(NOT GIT_FOUND) ++# MESSAGE(FATAL_ERROR "Git not found!.") ++#endif() + + MACRO(History_GET_REVISION variable) + IF(EXISTS ${CMAKE_SOURCE_DIR}/History.txt) |