From: Julian Andres Klode <jak@debian.org>
Date: Fri, 19 Aug 2016 23:15:27 +0000 (+0200)
Subject: CMake: Translations: Build byproduct before output
X-Git-Tag: 1.3_rc3~26
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/c43a7ed46ce5fb88235c954dc210dd02a5e6e377?ds=inline

CMake: Translations: Build byproduct before output

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.
---

diff --git a/CMake/Translations.cmake b/CMake/Translations.cmake
index c2d3901fd..3562172bd 100644
--- a/CMake/Translations.cmake
+++ b/CMake/Translations.cmake
@@ -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