The branch, master, has been updated. - Log -----------------------------------------------------------------
commit d854ded56eb2241028380ec053425bdf830b6b12 Author: Kornel Benko <[email protected]> Date: Wed Oct 24 10:24:59 2012 +0200 Cmake build: Do not recreate Resources.qrc at build-time for WIN32. (For some yet unknown reason it does not work) diff --git a/development/cmake/modules/LyXMacros.cmake b/development/cmake/modules/LyXMacros.cmake index b41de4d..816112e 100644 --- a/development/cmake/modules/LyXMacros.cmake +++ b/development/cmake/modules/LyXMacros.cmake @@ -229,10 +229,12 @@ 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 - ) + if(NOT WIN32) + add_custom_command( + OUTPUT ${_qrc_name} + COMMAND ${CMAKE_COMMAND} --build "${CMAKE_BINARY_DIR}" --target rebuild_cache + ) + endif() endmacro(lyx_qt_resources_file) ----------------------------------------------------------------------- Summary of changes: development/cmake/modules/LyXMacros.cmake | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) hooks/post-receive -- The LyX Source Repository
