The branch, master, has been updated. - Log -----------------------------------------------------------------
commit 2626821ee2230613f5eb6ed69e506e59159813da Author: Kornel Benko <[email protected]> Date: Tue Oct 23 13:23:07 2012 +0200 Cmake build: Modifications needed to work also if the path to build-dir contains spaces. (Tested on linux) diff --git a/development/cmake/modules/LyXMacros.cmake b/development/cmake/modules/LyXMacros.cmake index a137dc3..b41de4d 100644 --- a/development/cmake/modules/LyXMacros.cmake +++ b/development/cmake/modules/LyXMacros.cmake @@ -231,7 +231,7 @@ macro(lyx_qt_resources_file _qrc_name _to_dir _list) endif() add_custom_command( OUTPUT ${_qrc_name} - COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target rebuild_cache + COMMAND ${CMAKE_COMMAND} --build "${CMAKE_BINARY_DIR}" --target rebuild_cache ) endmacro(lyx_qt_resources_file) diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt index 30c65f8..cc386ce 100755 --- a/po/CMakeLists.txt +++ b/po/CMakeLists.txt @@ -120,7 +120,12 @@ ADD_CUSTOM_COMMAND( OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${_lyxname}.pot" COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_BINARY_DIR}/${_lyxname}.fmt.pot" "${CMAKE_CURRENT_BINARY_DIR}/${_lyxname}.pot" COMMAND ${GETTEXT_XGETTEXT_EXECUTABLE} - ARGS --default-domain=${_lyxname} --directory=${TOP_SRC_DIR} --add-comments=TRANSLATORS: --language=C++ --join-existing --keyword=_ --keyword=N_ --keyword=B_ --keyword=qt_ --files-from="${CMAKE_CURRENT_BINARY_DIR}/POTFILES.in" --copyright-holder="LyX Developers" [email protected] -o "${CMAKE_CURRENT_BINARY_DIR}/${_lyxname}.pot" + --default-domain=${_lyxname} --directory=${TOP_SRC_DIR} + --add-comments=TRANSLATORS: + --language=C++ --join-existing --keyword=_ --keyword=N_ --keyword=B_ --keyword=qt_ + --files-from=${CMAKE_CURRENT_BINARY_DIR}/POTFILES.in + --copyright-holder="LyX Developers" [email protected] + -o "${CMAKE_CURRENT_BINARY_DIR}/${_lyxname}.pot" DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/${_lyxname}.fmt.pot" ${_potfiles_dep} ) ----------------------------------------------------------------------- Summary of changes: development/cmake/modules/LyXMacros.cmake | 2 +- po/CMakeLists.txt | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) hooks/post-receive -- The LyX Source Repository
