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 a137dc3ebcc14a8d3de44a54761f7928239b4daf..b41de4d8a0a3b44e20e661d28edd48c9ac0487ba 100644 (file)
--- 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 30c65f80b422af877f8b71d2277d4f63409b7c38..cc386ce9ff86ca377cb8e393f23299a2d9a542f5 100755 (executable)
--- 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" --msgid-bugs-address=lyx-devel@lists.lyx.org -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" --msgid-bugs-address=lyx-devel@lists.lyx.org
+      -o "${CMAKE_CURRENT_BINARY_DIR}/${_lyxname}.pot"
     DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/${_lyxname}.fmt.pot" ${_potfiles_dep}
     )