]>
Commit | Line | Data |
---|---|---|
d051ba14 JR |
1 | --- domoticz-2020.2/CMakeLists.txt.orig 2020-06-06 12:02:05.000000000 +0200 |
2 | +++ domoticz-2020.2/CMakeLists.txt 2020-06-06 12:19:29.867654435 +0200 | |
9a71e0cb | 3 | @@ -88,39 +88,13 @@ |
d051ba14 JR |
4 | ENDIF(EXISTS ${CMAKE_SOURCE_DIR}/History.txt) |
5 | ENDMACRO(History_GET_REVISION) | |
6 | ||
7 | -MACRO(Gitversion_GET_REVISION dir variable) | |
8 | - EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} --git-dir ./.git rev-list HEAD --count | |
9 | - WORKING_DIRECTORY ${dir} | |
10 | - OUTPUT_VARIABLE ${variable} | |
11 | - OUTPUT_STRIP_TRAILING_WHITESPACE) | |
12 | -ENDMACRO(Gitversion_GET_REVISION) | |
13 | - | |
14 | find_package(Git QUIET) | |
15 | ||
16 | -Gitversion_GET_REVISION("${CMAKE_SOURCE_DIR}" ProjectRevision) | |
17 | -IF(NOT ProjectRevision) | |
18 | - MESSAGE(STATUS "Failed to get ProjectRevision from git") | |
19 | - History_GET_REVISION(ProjectRevision) | |
20 | -ELSE(NOT ProjectRevision) | |
21 | - MATH(EXPR ProjectRevision "${ProjectRevision}+2107") | |
22 | -ENDIF(NOT ProjectRevision) | |
d051ba14 JR |
23 | +History_GET_REVISION(ProjectRevision) |
24 | ||
25 | ### SUBMODULE / BUNDLED SOFTWARE | |
26 | # | |
27 | # | |
9a71e0cb | 28 | -IF(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git") |
d051ba14 | 29 | -# Update submodules as needed |
9a71e0cb | 30 | - IF(GIT_SUBMODULE) |
d051ba14 | 31 | - message(STATUS "Submodule update") |
9a71e0cb | 32 | - execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init --remote --recursive |
d051ba14 JR |
33 | - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} |
34 | - RESULT_VARIABLE GIT_SUBMOD_RESULT) | |
9a71e0cb | 35 | - IF(NOT GIT_SUBMOD_RESULT EQUAL "0") |
d051ba14 | 36 | - message(FATAL_ERROR "git submodule update --init failed with ${GIT_SUBMOD_RESULT}, please checkout submodules") |
9a71e0cb JP |
37 | - ENDIF() |
38 | - ENDIF() | |
39 | -ENDIF() | |
d051ba14 | 40 | - |
9a71e0cb | 41 | IF(USE_BUILTIN_JSONCPP AND NOT EXISTS "${PROJECT_SOURCE_DIR}/extern/jsoncpp/CMakeLists.txt") |
d051ba14 | 42 | message(FATAL_ERROR "The submodules were not downloaded! GIT_SUBMODULE was turned off or failed. Please update submodules and try again.") |
9a71e0cb | 43 | ENDIF() |
d051ba14 JR |
44 | --- domoticz-2020.2/getgit.cmake.orig 2020-04-26 15:49:25.000000000 +0200 |
45 | +++ domoticz-2020.2/getgit.cmake 2020-06-06 12:19:42.567678153 +0200 | |
080c2844 JR |
46 | @@ -2,11 +2,6 @@ |
47 | # please take into account, that the variable 'SOURCE_DIR' has been defined by the caller | |
48 | ||
49 | # the git.cmake module is part of the standard distribution | |
50 | -find_package(Git) | |
51 | -if(NOT GIT_FOUND) | |
52 | - MESSAGE(FATAL_ERROR "Git not found!.") | |
53 | -endif() | |
54 | - | |
55 | MACRO(History_GET_REVISION variable) | |
56 | IF(EXISTS ${CMAKE_SOURCE_DIR}/History.txt) | |
57 | MESSAGE(STATUS "Read ProjectRevision from History.txt") | |
58 | @@ -23,55 +18,11 @@ | |
d051ba14 JR |
59 | ENDIF(EXISTS ${CMAKE_SOURCE_DIR}/History.txt) |
60 | ENDMACRO(History_GET_REVISION) | |
61 | ||
62 | -MACRO(Gitversion_GET_REVISION dir variable) | |
63 | - EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} --git-dir ./.git rev-list HEAD --count | |
64 | - WORKING_DIRECTORY ${dir} | |
65 | - OUTPUT_VARIABLE ${variable} | |
66 | - OUTPUT_STRIP_TRAILING_WHITESPACE) | |
67 | -ENDMACRO(Gitversion_GET_REVISION) | |
68 | - | |
69 | -MACRO(Gitversion_GET_HASH dir variable) | |
70 | - EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} --git-dir ./.git rev-parse --short HEAD | |
71 | - WORKING_DIRECTORY ${dir} | |
72 | - OUTPUT_VARIABLE ${variable} | |
73 | - OUTPUT_STRIP_TRAILING_WHITESPACE) | |
74 | -ENDMACRO(Gitversion_GET_HASH) | |
75 | - | |
76 | -MACRO(Gitversion_GET_DATE dir variable) | |
77 | - EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} --git-dir ./.git show -s --format=%ct | |
78 | - WORKING_DIRECTORY ${dir} | |
79 | - OUTPUT_VARIABLE ${variable} | |
80 | - OUTPUT_STRIP_TRAILING_WHITESPACE) | |
81 | -ENDMACRO(Gitversion_GET_DATE) | |
82 | - | |
83 | -MACRO(Gitversion_CHECK_DIRTY dir variable) | |
9a71e0cb | 84 | - EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} --git-dir ./.git diff-index -m --ignore-submodules --name-only HEAD |
d051ba14 JR |
85 | - WORKING_DIRECTORY ${dir} |
86 | - OUTPUT_VARIABLE ${variable} | |
87 | - OUTPUT_STRIP_TRAILING_WHITESPACE) | |
88 | -ENDMACRO(Gitversion_CHECK_DIRTY) | |
89 | - | |
90 | -Gitversion_GET_REVISION("${SOURCE_DIR}" ProjectRevision) | |
91 | -IF(NOT ProjectRevision) | |
92 | - History_GET_REVISION(ProjectRevision) | |
93 | -ELSE(NOT ProjectRevision) | |
94 | - MATH(EXPR ProjectRevision "${ProjectRevision}+2107") | |
95 | -ENDIF(NOT ProjectRevision) | |
96 | -Gitversion_GET_HASH("${SOURCE_DIR}" ProjectHash) | |
97 | -IF(NOT ProjectHash) | |
98 | - MESSAGE(STATUS "Failed to get ProjectHash from git, set it to 0") | |
99 | - set (ProjectHash 0) | |
100 | -ENDIF(NOT ProjectHash) | |
101 | -Gitversion_GET_DATE("${SOURCE_DIR}" ProjectDate) | |
102 | -IF(NOT ProjectDate) | |
103 | - MESSAGE(STATUS "Failed to get ProjectDate from git, set it to 0") | |
104 | - set (ProjectDate 0) | |
105 | -ENDIF(NOT ProjectDate) | |
106 | -Gitversion_CHECK_DIRTY("${SOURCE_DIR}" ProjectDirty) | |
107 | -IF(ProjectDirty) | |
108 | - MESSAGE(STATUS "domoticz has been modified locally: adding \"-modified\" to hash") | |
109 | - set (ProjectHash "${ProjectHash}-modified") | |
110 | -ENDIF(ProjectDirty) | |
111 | +History_GET_REVISION(ProjectRevision) | |
112 | +MESSAGE(STATUS "Failed to get ProjectHash from git, set it to 0") | |
113 | +set (ProjectHash 0) | |
114 | +MESSAGE(STATUS "Failed to get ProjectDate from git, set it to 0") | |
115 | +set (ProjectDate 0) | |
116 | ||
117 | # write a file with the APPVERSION define | |
118 | file(WRITE ${SOURCE_DIR}/appversion.h.txt "#define APPVERSION ${ProjectRevision}\n#define APPHASH \"${ProjectHash}\"\n#define APPDATE ${ProjectDate}\n") |