From 3616f855a98ddfa80ac3dbf6851bf853abd278fc Mon Sep 17 00:00:00 2001 From: Ryan Schmidt Date: Wed, 21 Sep 2022 01:32:09 -0500 Subject: [PATCH] cmake: Allow specifying rez files by absolute path This allows generated rez files to be listed in add_application by their full path in the build directory, e.g. ${CMAKE_CURRENT_BINARY_DIR}/foo.r Closes #176 --- cmake/add_application.cmake | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/cmake/add_application.cmake b/cmake/add_application.cmake index dc7f2a1c29..603e77ce0b 100644 --- a/cmake/add_application.cmake +++ b/cmake/add_application.cmake @@ -28,21 +28,21 @@ function(add_application name) list(TRANSFORM rez_include_options PREPEND -I) foreach(f ${ARGS_FILES}) + get_filename_component(abspath "${f}" ABSOLUTE) if(${f} MATCHES "\\.r$") + get_filename_component(rsrc_file "${f}" NAME) + set(rsrc_file "${CMAKE_CURRENT_BINARY_DIR}/${rsrc_file}.rsrc.bin") add_custom_command( - OUTPUT ${f}.rsrc.bin - COMMAND ${REZ} ${REZ_FLAGS} ${CMAKE_CURRENT_SOURCE_DIR}/${f} ${rez_include_options} -o ${f}.rsrc.bin - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${f}) - list(APPEND rsrc_files "${CMAKE_CURRENT_BINARY_DIR}/${f}.rsrc.bin") - list(APPEND rez_files "${f}") + OUTPUT ${rsrc_file} + COMMAND ${REZ} ${REZ_FLAGS} ${abspath} ${rez_include_options} -o ${rsrc_file} + DEPENDS ${abspath}) + list(APPEND rsrc_files "${rsrc_file}") + list(APPEND rez_files "${abspath}") elseif(${f} MATCHES "\\.rsrc$") - get_filename_component(abspath "${f}" ABSOLUTE) list(APPEND rsrc_files "${abspath}") elseif(${f} MATCHES "\\.rsrc.bin$") - get_filename_component(abspath "${f}" ABSOLUTE) list(APPEND rsrc_files "${abspath}") else() - get_filename_component(abspath "${f}" ABSOLUTE) list(APPEND files "${abspath}") endif() endforeach()