From: Kornel Benko <kornel@lyx.org>
Date: Tue, 23 Oct 2012 11:23:07 +0000 (+0200)
Subject: Cmake build:
X-Git-Tag: 2.1.0beta1~1350
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=2626821ee2230613f5eb6ed69e506e59159813da;p=lyx.git

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 a137dc3ebc..b41de4d8a0 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 30c65f80b4..cc386ce9ff 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" --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}
     )