--- domoticz-2020.2/CMakeLists.txt.orig 2020-06-06 12:02:05.000000000 +0200 +++ domoticz-2020.2/CMakeLists.txt 2020-06-06 12:19:29.867654435 +0200 @@ -88,39 +88,13 @@ ENDIF(EXISTS ${CMAKE_SOURCE_DIR}/History.txt) ENDMACRO(History_GET_REVISION) -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) - find_package(Git QUIET) -Gitversion_GET_REVISION("${CMAKE_SOURCE_DIR}" ProjectRevision) -IF(NOT ProjectRevision) - MESSAGE(STATUS "Failed to get ProjectRevision from git") - History_GET_REVISION(ProjectRevision) -ELSE(NOT ProjectRevision) - MATH(EXPR ProjectRevision "${ProjectRevision}+2107") -ENDIF(NOT ProjectRevision) +History_GET_REVISION(ProjectRevision) ### SUBMODULE / BUNDLED SOFTWARE # # -IF(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git") -# Update submodules as needed - IF(GIT_SUBMODULE) - message(STATUS "Submodule update") - execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init --remote --recursive - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - RESULT_VARIABLE GIT_SUBMOD_RESULT) - IF(NOT GIT_SUBMOD_RESULT EQUAL "0") - message(FATAL_ERROR "git submodule update --init failed with ${GIT_SUBMOD_RESULT}, please checkout submodules") - ENDIF() - ENDIF() -ENDIF() - IF(USE_BUILTIN_JSONCPP AND NOT EXISTS "${PROJECT_SOURCE_DIR}/extern/jsoncpp/CMakeLists.txt") message(FATAL_ERROR "The submodules were not downloaded! GIT_SUBMODULE was turned off or failed. Please update submodules and try again.") ENDIF() --- domoticz-2020.2/getgit.cmake.orig 2020-04-26 15:49:25.000000000 +0200 +++ domoticz-2020.2/getgit.cmake 2020-06-06 12:19:42.567678153 +0200 @@ -2,11 +2,6 @@ # 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 -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) MESSAGE(STATUS "Read ProjectRevision from History.txt") @@ -23,55 +18,11 @@ ENDIF(EXISTS ${CMAKE_SOURCE_DIR}/History.txt) ENDMACRO(History_GET_REVISION) -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 --ignore-submodules --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) - History_GET_REVISION(ProjectRevision) -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) +History_GET_REVISION(ProjectRevision) +MESSAGE(STATUS "Failed to get ProjectHash from git, set it to 0") +set (ProjectHash 0) +MESSAGE(STATUS "Failed to get ProjectDate from git, set it to 0") +set (ProjectDate 0) # 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")