From a4ee59087561d470eda4a85843f864b27c07b2cb Mon Sep 17 00:00:00 2001 From: WerWolv Date: Tue, 9 Dec 2025 21:31:50 +0100 Subject: [PATCH] build: Only build the version stripper on mingw --- cmake/build_helpers.cmake | 44 ++++++++++++++++++++------------------- main/CMakeLists.txt | 5 ++++- 2 files changed, 27 insertions(+), 22 deletions(-) diff --git a/cmake/build_helpers.cmake b/cmake/build_helpers.cmake index ff421964e..c310d8f9a 100644 --- a/cmake/build_helpers.cmake +++ b/cmake/build_helpers.cmake @@ -332,29 +332,31 @@ macro(createPackage) endforeach() ]]) - set(VERSIONLESS_LIBWINPTHREAD "${CMAKE_BINARY_DIR}/libwinpthread-1.dll") - find_file(LIBWINPTHREAD_PATH NAMES libwinpthread-1.dll) - if (NOT LIBWINPTHREAD_PATH) - message(FATAL_ERROR "Could not find libwinpthread-1.dll!") + if (NOT MSVC) + set(VERSIONLESS_LIBWINPTHREAD "${CMAKE_BINARY_DIR}/libwinpthread-1.dll") + find_file(LIBWINPTHREAD_PATH NAMES libwinpthread-1.dll) + if (NOT LIBWINPTHREAD_PATH) + message(FATAL_ERROR "Could not find libwinpthread-1.dll!") + endif() + + add_custom_command( + OUTPUT ${VERSIONLESS_LIBWINPTHREAD} + COMMAND $ ${LIBWINPTHREAD_PATH} ${VERSIONLESS_LIBWINPTHREAD} + DEPENDS version-stripper + COMMENT "Stripping version info from libwinpthread..." + VERBATIM + ) + + add_custom_target(versionless_libwinpthread ALL + DEPENDS ${VERSIONLESS_LIBWINPTHREAD} + ) + + # Install the generated file + install(FILES ${VERSIONLESS_LIBWINPTHREAD} + DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}" + ) endif() - add_custom_command( - OUTPUT ${VERSIONLESS_LIBWINPTHREAD} - COMMAND $ ${LIBWINPTHREAD_PATH} ${VERSIONLESS_LIBWINPTHREAD} - DEPENDS version-stripper - COMMENT "Stripping version info from libwinpthread..." - VERBATIM - ) - - add_custom_target(versionless_libwinpthread ALL - DEPENDS ${VERSIONLESS_LIBWINPTHREAD} - ) - - # Install the generated file - install(FILES ${VERSIONLESS_LIBWINPTHREAD} - DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}" - ) - downloadImHexPatternsFiles(".") elseif(UNIX AND NOT APPLE) set_target_properties(libimhex PROPERTIES SOVERSION ${IMHEX_VERSION}) diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt index 94131c0ac..283be0ba6 100644 --- a/main/CMakeLists.txt +++ b/main/CMakeLists.txt @@ -7,7 +7,10 @@ endif () add_subdirectory(gui) if (WIN32) add_subdirectory(forwarder) - add_subdirectory(version_stripper) + + if (NOT MSVC) + add_subdirectory(version_stripper) + endif() endif () if (NOT EMSCRIPTEN)