mirror
/
ImHex
mirror of https://github.com/WerWolv/ImHex
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build: Manually set FILEVERSION of libwinpthread to 0.0.0.0 

#2550
This commit is contained in:
WerWolv 2025-12-08 23:53:57 +01:00
parent 4914a34dd9
commit 4d10d9a195
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cmake/build_helpers.cmake
View File

@ -211,10 +211,6 @@ macro(configurePackingResources)
set(CPACK_WIX_UI_DIALOG "${PROJECT_SOURCE_DIR}/resources/dist/windows/wix_dialog.png") set(CPACK_WIX_UI_DIALOG "${PROJECT_SOURCE_DIR}/resources/dist/windows/wix_dialog.png")
set(CPACK_WIX_CULTURES "en-US;de-DE;ja-JP;it-IT;pt-BR;zh-CN;zh-TW;ru-RU") set(CPACK_WIX_CULTURES "en-US;de-DE;ja-JP;it-IT;pt-BR;zh-CN;zh-TW;ru-RU")
if (NOT MSVC)
set(CPACK_WIX_PATCH_FILE "${PROJECT_SOURCE_DIR}/resources/dist/windows/wix_patch.xml")
endif()
set(CPACK_PACKAGE_INSTALL_DIRECTORY "ImHex") set(CPACK_PACKAGE_INSTALL_DIRECTORY "ImHex")
set_property(INSTALL "$<TARGET_FILE_NAME:main>" set_property(INSTALL "$<TARGET_FILE_NAME:main>"
PROPERTY CPACK_START_MENU_SHORTCUTS "ImHex" PROPERTY CPACK_START_MENU_SHORTCUTS "ImHex"
@ -334,6 +330,20 @@ macro(createPackage)
FILES "${_file}" FILES "${_file}"
) )
endforeach() endforeach()
# Download rcedit if not already present
set(RCEDIT_PATH "${CMAKE_BINARY_DIR}/rcedit.exe")
if(NOT EXISTS ${RCEDIT_PATH})
file(DOWNLOAD
"https://github.com/electron/rcedit/releases/download/v2.0.0/rcedit-x64.exe"
${RCEDIT_PATH}
)
endif()
execute_process(COMMAND ${RCEDIT_PATH}
"${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/libwinpthread-1.dll"
--set-file-version "0,0,0,0"
)
]]) ]])
downloadImHexPatternsFiles(".") downloadImHexPatternsFiles(".")

8
resources/dist/windows/wix_patch.xml vendored
View File

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<CPackWiXPatch>
<!-- libwinpthread has a bogus FILEVERSION field that's hardcoded to 1.0.0.0. Ignore it and always install it-->
<CPackWiXFragment Id="CM_FP_libwinpthread_1.dll">
<File Id="CM_FP_libwinpthread_1.dll"
CompanionFile="CM_FP_imhex.exe"/>
</CPackWiXFragment>
</CPackWiXPatch>