From da4f275bd1c18b897e5c2dd0043546de3accce0a Mon Sep 17 00:00:00 2001 From: Lasse Collin Date: Sat, 28 Sep 2024 15:19:14 +0300 Subject: [PATCH] CMake: Fix Windows resource file dependencies If common_w32res.rc is modified, the resource files need to be rebuilt. In contrast, the liblzma*.map files truly are link dependencies. --- CMakeLists.txt | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ac084741..16ee4d5d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1375,8 +1375,8 @@ if(WIN32) # Add the Windows resource file for liblzma.dll. target_sources(liblzma PRIVATE src/liblzma/liblzma_w32res.rc) - set_target_properties(liblzma PROPERTIES - LINK_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/src/common/common_w32res.rc" + set_source_files_properties(src/liblzma/liblzma_w32res.rc PROPERTIES + OBJECT_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/src/common/common_w32res.rc" ) # Export the public API symbols with __declspec(dllexport). @@ -1851,8 +1851,9 @@ if(HAVE_DECODERS) if(WIN32) # Add the Windows resource file for xzdec.exe or lzmadec.exe. target_sources("${XZDEC}" PRIVATE "src/xzdec/${XZDEC}_w32res.rc") - set_target_properties("${XZDEC}" PROPERTIES - LINK_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/src/common/common_w32res.rc" + set_source_files_properties( + "src/xzdec/${XZDEC}_w32res.rc" PROPERTIES + OBJECT_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/src/common/common_w32res.rc" ) endif() @@ -1919,8 +1920,8 @@ if(XZ_TOOL_LZMAINFO AND HAVE_DECODERS) if(WIN32) # Add the Windows resource file for lzmainfo.exe. target_sources(lzmainfo PRIVATE src/lzmainfo/lzmainfo_w32res.rc) - set_target_properties(lzmainfo PROPERTIES - LINK_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/src/common/common_w32res.rc" + set_source_files_properties(src/lzmainfo/lzmainfo_w32res.rc PROPERTIES + OBJECT_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/src/common/common_w32res.rc" ) endif() @@ -2032,8 +2033,8 @@ this many MiB of RAM if xz cannot determine the amount at runtime") if(WIN32) # Add the Windows resource file for xz.exe. target_sources(xz PRIVATE src/xz/xz_w32res.rc) - set_target_properties(xz PROPERTIES - LINK_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/src/common/common_w32res.rc" + set_source_files_properties(src/xz/xz_w32res.rc PROPERTIES + OBJECT_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/src/common/common_w32res.rc" ) endif()