diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-08-11 22:39:38 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-08-11 22:39:38 +0400 |
| commit | df1dd658c9554cf53040f05e6a4926c0b6e70e95 (patch) | |
| tree | fb3ff26d3ecfd00f5b904e5a81313426ccc7693e /build_files | |
| parent | ca7c07cda942976d805fcf2bbfe168b4b7b3fe18 (diff) | |
minor improvements to cmake's datatoc usage, now changes to datatoc.c re-make generated files.
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/cmake/macros.cmake | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index 3d2d19c7685..1340920eafa 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -739,10 +739,8 @@ macro(data_to_c add_custom_command( OUTPUT ${file_to} COMMAND ${CMAKE_COMMAND} -E make_directory ${_file_to_path} - COMMAND ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/datatoc - ${file_from} - ${file_to} - DEPENDS ${file_from}) + COMMAND ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/datatoc ${file_from} ${file_to} + DEPENDS ${file_from} datatoc) unset(_file_to_path) endmacro() @@ -751,22 +749,21 @@ macro(data_to_c_simple file_from list_to_add) - # only to avoid confusion - set(_file_to ${file_from}.c) + # remove ../'s + get_filename_component(_file_from ${CMAKE_CURRENT_SOURCE_DIR}/${file_from} REALPATH) + get_filename_component(_file_to ${CMAKE_CURRENT_BINARY_DIR}/${file_from}.c REALPATH) - list(APPEND ${list_to_add} ${CMAKE_CURRENT_BINARY_DIR}/${_file_to}) + list(APPEND ${list_to_add} ${_file_to}) get_filename_component(_file_to_path ${_file_to} PATH) add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file_to} + OUTPUT ${_file_to} COMMAND ${CMAKE_COMMAND} -E make_directory ${_file_to_path} - COMMAND ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/datatoc - ${CMAKE_CURRENT_SOURCE_DIR}/${file_from} - ${CMAKE_CURRENT_BINARY_DIR}/${_file_to} - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${file_from}) + COMMAND ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/datatoc ${_file_from} ${_file_to} + DEPENDS ${_file_from} datatoc) - unset(_var_name) + unset(_file_from) unset(_file_to) unset(_file_to_path) endmacro() |