fix: set version for Windows binaries
This commit is contained in:
		| @@ -128,6 +128,8 @@ message(STATUS "Git commit: ${Launcher_GIT_COMMIT}") | |||||||
| message(STATUS "Git refspec: ${Launcher_GIT_REFSPEC}") | message(STATUS "Git refspec: ${Launcher_GIT_REFSPEC}") | ||||||
|  |  | ||||||
| set(Launcher_RELEASE_VERSION_NAME "${Launcher_VERSION_MAJOR}.${Launcher_VERSION_MINOR}.${Launcher_VERSION_HOTFIX}") | set(Launcher_RELEASE_VERSION_NAME "${Launcher_VERSION_MAJOR}.${Launcher_VERSION_MINOR}.${Launcher_VERSION_HOTFIX}") | ||||||
|  | set(Launcher_RELEASE_VERSION_NAME4 "${Launcher_RELEASE_VERSION_NAME}.0") | ||||||
|  | set(Launcher_RELEASE_VERSION_NAME4_COMMA "${Launcher_VERSION_MAJOR},${Launcher_VERSION_MINOR},${Launcher_VERSION_HOTFIX},0") | ||||||
| string(TIMESTAMP TODAY "%Y-%m-%d") | string(TIMESTAMP TODAY "%Y-%m-%d") | ||||||
| set(Launcher_RELEASE_TIMESTAMP "${TODAY}") | set(Launcher_RELEASE_TIMESTAMP "${TODAY}") | ||||||
|  |  | ||||||
|   | |||||||
| @@ -963,7 +963,7 @@ qt5_add_resources(LAUNCHER_RESOURCES | |||||||
|  |  | ||||||
| ######## Windows resource files ######## | ######## Windows resource files ######## | ||||||
| if(WIN32) | if(WIN32) | ||||||
|     set(LAUNCHER_RCS ../${Launcher_Branding_WindowsRC}) |     set(LAUNCHER_RCS ${CMAKE_CURRENT_BINARY_DIR}/../${Launcher_Branding_WindowsRC}) | ||||||
| endif() | endif() | ||||||
|  |  | ||||||
| # Add executable | # Add executable | ||||||
|   | |||||||
| @@ -21,3 +21,6 @@ set(Launcher_Portable_File "program_info/portable.txt" PARENT_SCOPE) | |||||||
|  |  | ||||||
| configure_file(org.polymc.PolyMC.desktop.in org.polymc.PolyMC.desktop) | configure_file(org.polymc.PolyMC.desktop.in org.polymc.PolyMC.desktop) | ||||||
| configure_file(org.polymc.PolyMC.metainfo.xml.in org.polymc.PolyMC.metainfo.xml) | configure_file(org.polymc.PolyMC.metainfo.xml.in org.polymc.PolyMC.metainfo.xml) | ||||||
|  | configure_file(polymc.rc.in polymc.rc @ONLY) | ||||||
|  | configure_file(polymc.manifest.in polymc.manifest @ONLY) | ||||||
|  | configure_file(polymc.ico polymc.ico COPYONLY) | ||||||
|   | |||||||
| @@ -1,6 +1,6 @@ | |||||||
| <?xml version="1.0" encoding="UTF-8" standalone="yes"?> | <?xml version="1.0" encoding="UTF-8" standalone="yes"?> | ||||||
| <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3"> | <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3"> | ||||||
|   <assemblyIdentity name="PolyMC.Application.1" type="win32" version="1.0.0.0" /> |   <assemblyIdentity name="PolyMC.Application.1" type="win32" version="@Launcher_RELEASE_VERSION_NAME4@" /> | ||||||
|   <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> |   <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> | ||||||
|     <security> |     <security> | ||||||
|       <requestedPrivileges> |       <requestedPrivileges> | ||||||
| @@ -7,7 +7,7 @@ IDI_ICON1               ICON    DISCARDABLE     "polymc.ico" | |||||||
| 1 RT_MANIFEST "polymc.manifest" | 1 RT_MANIFEST "polymc.manifest" | ||||||
| 
 | 
 | ||||||
| VS_VERSION_INFO VERSIONINFO | VS_VERSION_INFO VERSIONINFO | ||||||
| FILEVERSION     1,0,0,0 | FILEVERSION     @Launcher_RELEASE_VERSION_NAME4_COMMA@ | ||||||
| FILEOS          VOS_NT_WINDOWS32 | FILEOS          VOS_NT_WINDOWS32 | ||||||
| FILETYPE        VFT_APP | FILETYPE        VFT_APP | ||||||
| BEGIN | BEGIN | ||||||
| @@ -17,9 +17,9 @@ BEGIN | |||||||
|                 BEGIN |                 BEGIN | ||||||
|                         VALUE "CompanyName", "MultiMC & PolyMC Contributors" |                         VALUE "CompanyName", "MultiMC & PolyMC Contributors" | ||||||
|                         VALUE "FileDescription", "PolyMC" |                         VALUE "FileDescription", "PolyMC" | ||||||
|                         VALUE "FileVersion", "1.0.0.0" |                         VALUE "FileVersion", "@Launcher_RELEASE_VERSION_NAME4@" | ||||||
|                         VALUE "ProductName", "PolyMC" |                         VALUE "ProductName", "PolyMC" | ||||||
|                         VALUE "ProductVersion", "1" |                         VALUE "ProductVersion", "@Launcher_RELEASE_VERSION_NAME4@" | ||||||
|                 END |                 END | ||||||
|         END |         END | ||||||
|         BLOCK "VarFileInfo" |         BLOCK "VarFileInfo" | ||||||
		Reference in New Issue
	
	Block a user