summaryrefslogtreecommitdiff
path: root/www/domoticz/files/patch-getgit.cmake
diff options
context:
space:
mode:
authorOleksii Samorukov <samm@FreeBSD.org>2020-05-26 20:01:42 +0000
committerOleksii Samorukov <samm@FreeBSD.org>2020-05-26 20:01:42 +0000
commitd2ad0f05150edad075b678ba746dd60c83b01c1f (patch)
tree2d9cc522be6d7bcfe14f5397e64a43d557fce1c3 /www/domoticz/files/patch-getgit.cmake
parent- Update to 3.8.1 (diff)
www/domoticz: Update to 2020.2
- Make LUA as hard dependency as internal LUA is not supported anymore - Make OPENZWAVE optional dependency - Enable usage of precompiled headers by default to follow the upstream - Use GH_TUPLE to load external dependencies from the github (upstream uses git submodules), disable GIT_SUBMODULE. As for now only MQQT is supported - Fix CMAKE_INSTALL_PREFIX (should be specified as Makefile option, not as CMAKE one) and remove patches obsoleted by that fix - USE CMAKE_ON/CMAKE_OFF for the better readability - Remove `post-patch` target, as version is normally set by the cmake itself - Include patches for the embedded `mosquitto`, disable mosquitto shared libraries installation - Update `pkg-plist` to support files added by the embedded dependencies - Remove `CONFLICTS` as there are no such matched packages in the ports tree - Fix build without PYTHON, patch accepted by the upstream - Remove most of the STATIC* options ChangeLog: https://github.com/domoticz/domoticz/blob/development/History.txt PR: 245007 Approved by: krion (mentor) Differential Revision: https://reviews.freebsd.org/D24984
Notes
Notes: svn path=/head/; revision=536650
Diffstat (limited to 'www/domoticz/files/patch-getgit.cmake')
-rw-r--r--www/domoticz/files/patch-getgit.cmake73
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)