From 4005d7befb3ffbbbb7851ed767d5b58373958e6d Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sun, 31 Dec 2023 22:37:30 +0400
Subject: [PATCH] Try to fix circular dependency between external_scudo and
 common_options

---
 init_target.cmake   | 8 ++++++++
 options_linux.cmake | 8 --------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/init_target.cmake b/init_target.cmake
index f022292..549865e 100644
--- a/init_target.cmake
+++ b/init_target.cmake
@@ -27,6 +27,14 @@ function(init_target target_name) # init_target(my_target [cxx_std_..] folder_na
         set_property(TARGET ${target_name} APPEND_STRING PROPERTY STATIC_LIBRARY_OPTIONS "$<IF:$<CONFIG:Debug>,,/LTCG>")
     endif()
 
+    if (LINUX AND NOT DESKTOP_APP_DISABLE_SCUDO AND NOT target_name STREQUAL external_scudo)
+        add_dependencies(${target_name} desktop-app::external_scudo)
+        target_link_options(${target_name}
+        PRIVATE
+            -Wl,--push-state,--whole-archive,$<TARGET_FILE:desktop-app::external_scudo>,--pop-state
+        )
+    endif()
+
     target_link_libraries(${target_name} PRIVATE desktop-app::common_options)
     set_target_properties(${target_name} PROPERTIES
         XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_WEAK YES
diff --git a/options_linux.cmake b/options_linux.cmake
index 0349ea9..5496622 100644
--- a/options_linux.cmake
+++ b/options_linux.cmake
@@ -99,14 +99,6 @@ if (NOT DESKTOP_APP_USE_PACKAGED OR DESKTOP_APP_SPECIAL_TARGET)
     )
 endif()
 
-if (NOT DESKTOP_APP_DISABLE_SCUDO)
-    target_link_libraries(common_options
-    INTERFACE
-        $<LINK_ONLY:desktop-app::external_scudo>
-        -Wl,--push-state,--whole-archive,$<TARGET_FILE:desktop-app::external_scudo>,--pop-state
-    )
-endif()
-
 if (DESKTOP_APP_USE_ALLOCATION_TRACER)
     target_link_options(common_options
     INTERFACE