From 693301a978c3c17f477eafd63f781c6c033cebba Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 17 Mar 2019 15:25:07 +0100 Subject: [PATCH] Fix WIX installer --- CMakeLists.txt | 8 +++++--- MinetestMapperGui.in.rc | 6 +++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f98be86..ec67931 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -130,11 +130,12 @@ endif() # Installation ############################################################################### -set (CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION ".") -include (InstallRequiredSystemLibraries) +set(CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION ".") +include(InstallRequiredSystemLibraries) +#set(CPACK_PACKAGE_EXECUTABLES MinetestMapperGUI "Minetest Mapper GUI") -INSTALL(TARGETS MinetestMapperGUI +install(TARGETS MinetestMapperGUI RUNTIME DESTINATION . LIBRARY DESTINATION lib ARCHIVE DESTINATION lib @@ -169,3 +170,4 @@ if(WIN32) FILES_MATCHING PATTERN "*.dll") endif(WIN32) +include(CPack) diff --git a/MinetestMapperGui.in.rc b/MinetestMapperGui.in.rc index 6692cc6..c26cd2d 100644 --- a/MinetestMapperGui.in.rc +++ b/MinetestMapperGui.in.rc @@ -17,20 +17,20 @@ VS_VERSION_INFO VERSIONINFO BEGIN BLOCK "StringFileInfo" BEGIN - BLOCK "04b004b0" + BLOCK "040904E4" BEGIN VALUE "CompanyName", "\0" VALUE "FileDescription", "${PROJECT_DESCRIPTION}\0" VALUE "FileVersion", "${PROJECT_VERSION}\0" VALUE "LegalCopyright", "2015-2019 addi; CC BY\0" - VALUE "OriginalFilename", "{PROJECT_NAME}.exe\0" + VALUE "OriginalFilename", "${PROJECT_NAME}.exe\0" VALUE "ProductName", "${PROJECT_NAME}\0" VALUE "ProductVersion", "${CMAKE_PROJECT_VERSION}\0" END END BLOCK "VarFileInfo" BEGIN - VALUE "Translation", 0x04b0, 1200 + VALUE "Translation", 0x409, 1252 END END /* End of Version info */