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>

diff --git a/admin/win/msi/CMakeLists.txt b/admin/win/msi/CMakeLists.txt
index 8d7597cb3ef35c87c78d60c60f44f99f11fd6442..a51aacd8dea56bd4f633c93c74964b25bc0ef286 100644 (file)
--- a/admin/win/msi/CMakeLists.txt
+++ b/admin/win/msi/CMakeLists.txt
@@ -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)