From 25794c505dcea1979968524a23ff69daf8165966 Mon Sep 17 00:00:00 2001
From: Lephenixnoir <sebastien.michelland@protonmail.com>
Date: Mon, 24 Mar 2025 16:09:27 +0100
Subject: [PATCH] cmake: add to LINK_DEPENDS in generate_g1a/g3a, don't
override it
---
fxsdk/cmake/GenerateG1A.cmake | 4 +++-
fxsdk/cmake/GenerateG3A.cmake | 5 +++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/fxsdk/cmake/GenerateG1A.cmake b/fxsdk/cmake/GenerateG1A.cmake
index 073cce4..5d5b3ea 100644
--- a/fxsdk/cmake/GenerateG1A.cmake
+++ b/fxsdk/cmake/GenerateG1A.cmake
@@ -56,6 +56,8 @@ function(generate_g1a)
WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
)
if(DEFINED G1A_ICON)
- set_target_properties("${G1A_TARGET}" PROPERTIES LINK_DEPENDS "${G1A_ICON}")
+ get_target_property(G1A_LDEP "${G1A_TARGET}" LINK_DEPENDS)
+ list(APPEND G1A_LDEP "${G1A_ICON}")
+ set_target_properties("${G1A_TARGET}" PROPERTIES LINK_DEPENDS "${G1A_LDEP}")
endif()
endfunction()
diff --git a/fxsdk/cmake/GenerateG3A.cmake b/fxsdk/cmake/GenerateG3A.cmake
index 129660d..e4cde20 100644
--- a/fxsdk/cmake/GenerateG3A.cmake
+++ b/fxsdk/cmake/GenerateG3A.cmake
@@ -68,7 +68,8 @@ function(generate_g3a)
COMMAND_EXPAND_LISTS
)
if(DEFINED G3A_ICONS)
- set_target_properties("${G3A_TARGET}" PROPERTIES
- LINK_DEPENDS "${G3A_ICON1};${G3A_ICON2}")
+ get_target_property(G3A_LDEP "${G3A_TARGET}" LINK_DEPENDS)
+ list(APPEND G3A_LDEP "${G3A_ICON1}" "${G3A_ICON2}")
+ set_target_properties("${G3A_TARGET}" PROPERTIES LINK_DEPENDS "${G3A_LDEP}")
endif()
endfunction()