Integrate the version suffix to the MSI filename
This should be enough to reinstate the "-daily" marker in the filename for daily builds. Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
This commit is contained in:
parent
bc78ee0ca8
commit
576a25161b
|
@ -8,7 +8,13 @@ string(SUBSTRING ${GIT_SHA1} 0 7 GIT_REVISION)
|
|||
|
||||
set(VERSION "${MIRALL_VERSION_MAJOR}.${MIRALL_VERSION_MINOR}.${MIRALL_VERSION_PATCH}.${MIRALL_VERSION_BUILD}")
|
||||
|
||||
set(MSI_INSTALLER_FILENAME "${APPLICATION_SHORTNAME}-${VERSION}-${MSI_BUILD_ARCH}.msi")
|
||||
if (NOT DEFINED MIRALL_VERSION_SUFFIX OR MIRALL_VERSION_SUFFIX MATCHES "git")
|
||||
set(VERSION_SUFFIX "")
|
||||
else()
|
||||
set(VERSION_SUFFIX "-${MIRALL_VERSION_SUFFIX}")
|
||||
endif()
|
||||
|
||||
set(MSI_INSTALLER_FILENAME "${APPLICATION_SHORTNAME}-${VERSION}${VERSION_SUFFIX}-${MSI_BUILD_ARCH}.msi")
|
||||
|
||||
configure_file(OEM.wxi.in ${CMAKE_CURRENT_BINARY_DIR}/OEM.wxi)
|
||||
configure_file(collect-transform.xsl.in ${CMAKE_CURRENT_BINARY_DIR}/collect-transform.xsl)
|
||||
|
|
Loading…
Reference in New Issue