From ecd9e18d67cebe8ed785ae01c9f165568a7d7d6f Mon Sep 17 00:00:00 2001
From: Giulio Eulisse <10544+ktf@users.noreply.github.com>
Date: Tue, 21 Apr 2026 10:45:18 +0200
Subject: [PATCH] Avoid spurious cyclic dependencies

The O2_PCM_DEPS target property should reevaluate correctly when
the dependencies change.
---
 cmake/AddRootDictionary.cmake        | 4 ++--
 cmake/O2SetROOTPCMDependencies.cmake | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cmake/AddRootDictionary.cmake b/cmake/AddRootDictionary.cmake
index 17fdd2bd286c0..16cbdec222043 100644
--- a/cmake/AddRootDictionary.cmake
+++ b/cmake/AddRootDictionary.cmake
@@ -149,11 +149,11 @@ function(add_root_dictionary target)
       $<$<BOOL:${prop}>:-D$<JOIN:${prop},$<SEMICOLON>-D>>
       $<$<BOOL:${hasExtraPatch}>:--extra-patch>
       $<$<BOOL:${hasExtraPatch}>:${CMAKE_CURRENT_LIST_DIR}/${A_EXTRA_PATCH}>
-      --pcmdeps "$<REMOVE_DUPLICATES:${list_pcm_deps_${target}}>"
+      --pcmdeps "$<REMOVE_DUPLICATES:$<TARGET_PROPERTY:${target},O2_PCM_DEPS>>"
       --headers "${headers}"
     COMMAND
     ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_BINARY_DIR}/${pcmBase} ${pcmFile}
-    DEPENDS ${headers} "$<REMOVE_DUPLICATES:${list_pcm_deps_${target}}>" ${A_EXTRA_PATCH})
+    DEPENDS ${headers} "$<REMOVE_DUPLICATES:$<TARGET_PROPERTY:${target},O2_PCM_DEPS>>" ${A_EXTRA_PATCH})
   # cmake-format: on
 
   # add dictionary source to the target sources
diff --git a/cmake/O2SetROOTPCMDependencies.cmake b/cmake/O2SetROOTPCMDependencies.cmake
index d3f266c9c0337..e12b916c2a559 100644
--- a/cmake/O2SetROOTPCMDependencies.cmake
+++ b/cmake/O2SetROOTPCMDependencies.cmake
@@ -37,7 +37,7 @@ function(set_root_pcm_dependencies)
           endforeach()
         endif()
       endforeach()
-      set(list_pcm_deps_${target} "${pcm_dep_list}" CACHE INTERNAL "List of pcm dependencies for ${target}")
+      set_property(TARGET ${target} PROPERTY O2_PCM_DEPS "${pcm_dep_list}")
     endif()
   endforeach()
 endfunction()