Small tweaks for Windows: no version information in path anymore but in the...

Small tweaks for Windows: no version information in path anymore but in the name as it appears in "add/remove software"

CMakeLists.txt

@@ -327,7 +327,7 @@ ELSE(UNIX)
 	IF(WIN32)
 		SET(CPACK_GENERATOR "NSIS")
 		SET(CPACK_NSIS_MUI_ICON "${CPACK_PACKAGE_ICON}")
-		SET(CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_NAME}-${VERSION}")
+		SET(CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_NAME}")
 		SET(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "${CPACK_PACKAGE_NAME}")
 		IF(INSTALL_DOC)
 			SET(CPACK_NSIS_MENU_LINKS
@@ -339,10 +339,12 @@ ELSE(UNIX)
 				"https://models.slf.ch/p/meteoio/" "Home page")
 		ENDIF(INSTALL_DOC)
 		#info for the add/uninstall software administration
+		SET(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_NAME}-${VERSION}")
 		SET(CPACK_NSIS_INSTALLED_ICON_NAME "doc\\\\icon.ico")
 		SET(CPACK_NSIS_URL_INFO_ABOUT "http://www.slf.ch")
 		SET(CPACK_NSIS_HELP_LINK "https://models.slf.ch/p/meteoio")
 		SET(CPACK_NSIS_CONTACT "${CPACK_PACKAGE_CONTACT}")
+		SET(CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL "ON")
 	ENDIF(WIN32)
 ENDIF(UNIX)