[Bf-blender-cvs] [8f2eec5] master: Build System: icon files now depend on UI_icons.h for CMake
Campbell Barton
noreply at git.blender.org
Mon Jan 27 07:27:50 CET 2014
Commit: 8f2eec5a15b5f26bfbe73382677add202adc89a9
Author: Campbell Barton
Date: Mon Jan 27 17:25:29 2014 +1100
https://developer.blender.org/rB8f2eec5a15b5f26bfbe73382677add202adc89a9
Build System: icon files now depend on UI_icons.h for CMake
Now changing UI_icons.h causes icons to be re-generated, without this
adding a new icon wouldn't automatically get into the generated PNG.
===================================================================
M build_files/cmake/macros.cmake
===================================================================
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index 70ae9ab..28af1c1 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -859,7 +859,13 @@ macro(data_to_c_simple_icons
#COMMAND python3 ${CMAKE_SOURCE_DIR}/source/blender/datatoc/datatoc_icon.py ${_path_from_abs} ${_file_from}
COMMAND ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/datatoc_icon ${_path_from_abs} ${_file_from}
COMMAND ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/datatoc ${_file_from} ${_file_to}
- DEPENDS ${_icon_files} datatoc_icon datatoc)
+ DEPENDS
+ ${_icon_files}
+ datatoc_icon
+ datatoc
+ # could be an arg but for now we only create icons depending on UI_icons.h
+ ${CMAKE_SOURCE_DIR}/source/blender/editors/include/UI_icons.h
+ )
set_source_files_properties(${_file_from} ${_file_to} PROPERTIES GENERATED TRUE)
More information about the Bf-blender-cvs
mailing list