]> git.saurik.com Git - apt.git/commitdiff
CMake: Translations: Build byproduct before output
authorJulian Andres Klode <jak@debian.org>
Fri, 19 Aug 2016 23:15:27 +0000 (01:15 +0200)
committerJulian Andres Klode <jak@debian.org>
Fri, 19 Aug 2016 23:17:09 +0000 (01:17 +0200)
This can lead to an inconsistent state otherwise, with the
output being updated and the byproduct not; for example,
when the build was manually interrupted.

CMake/Translations.cmake

index c2d3901fd6699ba61a559f26af61593f6a8bbfc5..3562172bd3a2010d2062b467cac44d37ed8df3be 100644 (file)
@@ -72,14 +72,14 @@ function(apt_add_translation_domain)
     # of .mo files.
     add_custom_command (OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${domain}.pot
         BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/${domain}.pot-tmp
-        COMMAND msgcomm --more-than=0 --sort-by-file
-                         ${sh_pot}
-                         ${CMAKE_CURRENT_BINARY_DIR}/${domain}.c.pot
-                         --output=${CMAKE_CURRENT_BINARY_DIR}/${domain}.pot
         COMMAND msgcomm --more-than=0 --omit-header --sort-by-file --add-location=file
                          ${sh_pot}
                          ${CMAKE_CURRENT_BINARY_DIR}/${domain}.c.pot
                          --output=${CMAKE_CURRENT_BINARY_DIR}/${domain}.pot-tmp0
+        COMMAND msgcomm --more-than=0 --sort-by-file
+                         ${sh_pot}
+                         ${CMAKE_CURRENT_BINARY_DIR}/${domain}.c.pot
+                         --output=${CMAKE_CURRENT_BINARY_DIR}/${domain}.pot
         COMMAND cmake -E copy_if_different
                          ${CMAKE_CURRENT_BINARY_DIR}/${domain}.pot-tmp0
                          ${CMAKE_CURRENT_BINARY_DIR}/${domain}.pot-tmp