The branch, master, has been updated. - Log -----------------------------------------------------------------
commit 485a20bee0b3dc31097d5a5016425d3d91f9c615 Merge: e94e9e4 db1c138 Author: Kornel Benko <[email protected]> Date: Sun Oct 21 19:20:04 2012 +0200 Merge branch 'master' of git.lyx.org:lyx commit e94e9e415f4a6ea074ea8ee34deee57b2b5d4d17 Author: Kornel Benko <[email protected]> Date: Sun Oct 21 19:16:37 2012 +0200 Cmake build: Recreate Resources.qrc at build-time if needed. (E.g. after `make clean') diff --git a/development/cmake/modules/LyXMacros.cmake b/development/cmake/modules/LyXMacros.cmake index 6514eb2..a137dc3 100644 --- a/development/cmake/modules/LyXMacros.cmake +++ b/development/cmake/modules/LyXMacros.cmake @@ -229,6 +229,11 @@ macro(lyx_qt_resources_file _qrc_name _to_dir _list) file(APPEND ${_qrc_name} "</qresource>\n") file(APPEND ${_qrc_name} "</RCC>\n") endif() + add_custom_command( + OUTPUT ${_qrc_name} + COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target rebuild_cache + ) + endmacro(lyx_qt_resources_file) ----------------------------------------------------------------------- Summary of changes: development/cmake/modules/LyXMacros.cmake | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) hooks/post-receive -- The LyX Source Repository
