diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-01-24 03:45:34 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-01-24 03:45:34 +0300 |
| commit | 7389bfdeb0691065e20977d5960517eaa8775993 (patch) | |
| tree | 5958a1ba37d3f6f5e89f0c72cda7b7522bbdb69f /build_files | |
| parent | e6064b412a6ed703d19028e2f05420af3bf45121 (diff) | |
| parent | bd5696f85718609bd42e46441df4bcdb0cdc4b76 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/cmake/macros.cmake | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index 417c012b526..cf6a94303cf 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -1387,7 +1387,7 @@ endfunction() # macro for converting pixmap directory to a png and then a c file function(data_to_c_simple_icons - path_from + path_from icon_prefix icon_names list_to_add ) @@ -1405,8 +1405,11 @@ function(data_to_c_simple_icons get_filename_component(_file_to_path ${_file_to} PATH) - # ideally we wouldn't glob, but storing all names for all pixmaps is a bit heavy - file(GLOB _icon_files "${path_from}/*.dat") + # Construct a list of absolute paths from input + set(_icon_files) + foreach(_var ${icon_names}) + list(APPEND _icon_files "${_path_from_abs}/${icon_prefix}${_var}.dat") + endforeach() add_custom_command( OUTPUT ${_file_from} ${_file_to} |