Merge branch 'MUME:master' into master

Author: KasparMetsa

CMakeLists.txt

@@ -219,7 +219,11 @@ if(EXISTS "${PROJECT_SOURCE_DIR}/.git")
            set(MMAPPER_BETA "false")
         else()
            message(STATUS "Building from branch ${GIT_BRANCH} with ref ${GIT_TAG_COMMIT_HASH}")
-           set(MMAPPER_VERSION_STRING "${GIT_TAG_COMMIT_HASH}")
+           if(NOT GIT_TAG_COMMIT_HASH MATCHES "^v")
+               set(MMAPPER_VERSION_STRING "v${MMAPPER_VERSION}-${GIT_TAG_COMMIT_HASH}")
+           else()
+               set(MMAPPER_VERSION_STRING "${GIT_TAG_COMMIT_HASH}")
+           endif()
            set(MMAPPER_BETA "true")
         endif()
     endif()

src/CMakeLists.txt

@@ -1012,18 +1012,24 @@ if(WIN32)
         USE_SOURCE_PERMISSIONS
         PATTERN "*.exe" EXCLUDE
     )
-    if(MSVC)
-        set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "${CPACK_NSIS_EXTRA_INSTALL_COMMANDS}
-            ExecWait '\\$INSTDIR\\\\vc_redist.x64.exe /q /norestart'
-            Delete '\\$INSTDIR\\\\vc_redist.x64.exe'
-            ")
-    endif()
 
     set(CPACK_SOURCE_GENERATOR "ZIP")
 
-    if(WITH_UPDATER)
+    if(PACKAGE_TYPE_NORMALIZED STREQUAL "Nsis")
         set(CPACK_GENERATOR "NSIS")
 
+        if(MSVC AND NOT MMAPPER_IS_DEBUG)
+            install(FILES
+                "${WINDEPLOYQT_STAGING}/vc_redist.x64.exe"
+                DESTINATION .
+                COMPONENT libraries
+            )
+            set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "${CPACK_NSIS_EXTRA_INSTALL_COMMANDS}
+                ExecWait '\\$INSTDIR\\\\vc_redist.x64.exe /q /norestart'
+                Delete '\\$INSTDIR\\\\vc_redist.x64.exe'
+                ")
+        endif()
+
         # Windows (NSIS) Settings
         set(CPACK_NSIS_EXECUTABLES_DIRECTORY ".")
         set(CPACK_NSIS_MENU_LINKS "mmapper.exe;MMapper")
@@ -1062,7 +1068,7 @@ if(WIN32)
         endif()
         # NSIS always displays a license page
         set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/COPYING.txt")
-    else()
+    elseif(PACKAGE_TYPE_NORMALIZED STREQUAL "AppX")
         # Windows AppX Settings
         set(CPACK_GENERATOR "External")
         set(APPX_NAME "${PROJECT_NAME}")