The branch, master, has been updated.

- Log -----------------------------------------------------------------

commit 1faaa3d4af00d41e2f729a887f537d50bdf6254f
Author: Kornel Benko <kor...@lyx.org>
Date:   Thu Jul 19 13:52:07 2012 +0200

    Typo + missing dependencies in cmake build

diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
index becb765..5007288 100755
--- a/po/CMakeLists.txt
+++ b/po/CMakeLists.txt
@@ -140,17 +140,23 @@ foreach(_pofile ${LYX_BASE_PO_FILES})
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_pofile}
     COMMAND ${CMAKE_COMMAND} -E copy ${TOP_SRC_DIR}/po/${_pofile} 
${CMAKE_CURRENT_BINARY_DIR}/${_pofile}
-    DEPENDS ${TOP_SRC_DIR}/po/${_pofile}
+    DEPENDS ${TOP_SRC_DIR}/po/${_pofile} 
"${CMAKE_CURRENT_BINARY_DIR}/installed_translations"
     )
   list(APPEND LYX_PO_FILES ${CMAKE_CURRENT_BINARY_DIR}/${_pofile})
 endforeach(_pofile)
 
 add_custom_command(
-  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/installed_languages"
-  COMMAND "$CMAKE_COMMAND}" -E echo ${INSTALLED_LANGUAGES} ">" 
"${CMAKE_CURRENT_BINARY_DIR}/installed_languages"
-  DEPENDS ${LYX_PO_FILES}
+  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/installed_translations.tmp"
+  COMMAND "${CMAKE_COMMAND}" -E echo ${INSTALLED_LANGUAGES} ">" 
"${CMAKE_CURRENT_BINARY_DIR}/installed_translations.tmp"
 )
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/installed_languages" DESTINATION .)
+
+add_custom_command(
+  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/installed_translations"
+  COMMAND "${CMAKE_COMMAND}" -E copy_if_different 
"${CMAKE_CURRENT_BINARY_DIR}/installed_translations.tmp" 
"${CMAKE_CURRENT_BINARY_DIR}/installed_translations"
+  DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/installed_translations.tmp"
+)
+
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/installed_translations" DESTINATION 
.)
 
 set(LYX_UPDATED_PO_FILES)
 foreach(_pofile ${LYX_BASE_PO_FILES})

-----------------------------------------------------------------------

Summary of changes:
 po/CMakeLists.txt |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

Reply via email to