mirror of https://github.com/Icinga/icinga2.git
Revert "Use full Git version tag for the MSI package."
This reverts commit 03750951c2
.
This commit is contained in:
parent
9c85b2c409
commit
7be74c8141
|
@ -40,6 +40,13 @@ file(READ "${CMAKE_CURRENT_SOURCE_DIR}/COPYING.Exceptions" ICINGA2_LICENSE_ADDIT
|
|||
set(ICINGA2_LICENSE "${ICINGA2_LICENSE_GPL}\n\n---\n\n${ICINGA2_LICENSE_ADDITIONS}")
|
||||
file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/LICENSE.txt" ${ICINGA2_LICENSE})
|
||||
|
||||
set(CPACK_PACKAGE_CONTACT "Icinga Development Team")
|
||||
set(CPACK_PACKAGE_VERSION ${ICINGA2_VERSION})
|
||||
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_BINARY_DIR}/LICENSE.txt")
|
||||
set(CPACK_WIX_UPGRADE_GUID "68C75073-7CEF-4FC9-8DA5-581758729696")
|
||||
set(CPACK_SOURCE_IGNORE_FILES "/.git/" "/debian/" "/.vagrant/" "/release/" "/debug/" "/build/" )
|
||||
include(CPack)
|
||||
|
||||
include(GetGitRevisionDescription)
|
||||
git_describe(GIT_VERSION --tags)
|
||||
if(GIT_VERSION MATCHES "-NOTFOUND$")
|
||||
|
@ -50,7 +57,7 @@ else()
|
|||
endif()
|
||||
|
||||
set(CPACK_PACKAGE_CONTACT "Icinga Development Team")
|
||||
set(CPACK_PACKAGE_VERSION ${GIT_VERSION})
|
||||
set(CPACK_PACKAGE_VERSION ${ICINGA2_VERSION})
|
||||
set(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/icinga-app\\\\icinga.ico")
|
||||
set(CPACK_NSIS_MUI_ICON "${CMAKE_CURRENT_SOURCE_DIR}/icinga-app\\\\icinga.ico")
|
||||
set(CPACK_NSIS_MUI_UNIICON "${CMAKE_CURRENT_SOURCE_DIR}/icinga-app\\\\icinga.ico")
|
||||
|
|
Loading…
Reference in New Issue