File tree Expand file tree Collapse file tree 2 files changed +9
-4
lines changed
Expand file tree Collapse file tree 2 files changed +9
-4
lines changed Original file line number Diff line number Diff line change @@ -210,7 +210,11 @@ macro(configurePackingResources)
210210 set (CPACK_WIX_UI_BANNER "${PROJECT_SOURCE_DIR} /resources/dist/windows/wix_banner.png" )
211211 set (CPACK_WIX_UI_DIALOG "${PROJECT_SOURCE_DIR} /resources/dist/windows/wix_dialog.png" )
212212 set (CPACK_WIX_CULTURES "en-US;de-DE;ja-JP;it-IT;pt-BR;zh-CN;zh-TW;ru-RU" )
213- set (CPACK_WIX_PATCH_FILE "${PROJECT_SOURCE_DIR} /resources/dist/windows/wix_patch.xml" )
213+
214+ if (NOT MSVC )
215+ set (CPACK_WIX_PATCH_FILE "${PROJECT_SOURCE_DIR} /resources/dist/windows/wix_patch.xml" )
216+ endif ()
217+
214218 set (CPACK_PACKAGE_INSTALL_DIRECTORY "ImHex" )
215219 set_property (INSTALL "$<TARGET_FILE_NAME:main>"
216220 PROPERTY CPACK_START_MENU_SHORTCUTS "ImHex"
Original file line number Diff line number Diff line change 11<?xml version =" 1.0" encoding =" UTF-8" ?>
22<CPackWiXPatch >
3- <CPackWiXFragment Id =" CM_CP_bin.libwinpthread_1.dll" >
4- <File Id =" CM_FP_bin.libwinpthread_1.dll"
5- CompanionFile =" CM_FP_bin.your_main_executable.exe" />
3+ <!-- libwinpthread has a bogus FILEVERSION field that's hardcoded to 1.0.0.0. Ignore it and always install it-->
4+ <CPackWiXFragment Id =" CM_FP_libwinpthread_1.dll" >
5+ <File Id =" CM_FP_libwinpthread_1.dll"
6+ CompanionFile =" CM_FP_imhex.exe" />
67 </CPackWiXFragment >
78</CPackWiXPatch >
You can’t perform that action at this time.
0 commit comments