From 7f8a62f6866fc8cd36178282a0a2256048d1107e Mon Sep 17 00:00:00 2001 From: Wolfgang Thaller Date: Tue, 9 Jan 2018 00:29:02 +0100 Subject: [PATCH] make SIZE resource overriding work again --- cmake/add_application.cmake | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/cmake/add_application.cmake b/cmake/add_application.cmake index 539ffbcd1f..1ce1106c90 100644 --- a/cmake/add_application.cmake +++ b/cmake/add_application.cmake @@ -55,8 +55,14 @@ function(add_application name) set_target_properties(${name} PROPERTIES LINKER_LANGUAGE CXX) endif() - foreach(f ${rsrc_files}) - list(APPEND ARGS_MAKEAPPL_ARGS "--copy" "${f}") + foreach(f ${rsrc_files}) + # DO NOT add --copy here. + # The files in rsrc_files are guaranteed to be .rsrc or .rsrc.bin, so they + # will be recognized by Rez. + # Currently, the --copy flag has the side effect that Rez processes all --copy inputs + # before other inputs, so this messes up the overriding mechanics, leading to the wrong SIZE resource + # being included. (duplicate resources shouldn't be replaced silently, and overriding should be explicit...) + list(APPEND ARGS_MAKEAPPL_ARGS "${f}") endforeach() if(NOT ARGS_TYPE)