@matheusbsbs / matheus-bagliano / commits / 8f45138725
Fork 0

cmake: fall back to using `vcpkg`'s `msgfmt.exe` on Windows

We are already relying on `vcpkg` to manage our dependencies, including `libiconv`. Let's also use the `msgfmt.exe` from there. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Johannes Schindelin committed Sep 30, 2020 at 15:26 UTC 8f4513872517b72fb49d914ee9af8d44c836fc5a
1 file changed +5 -1
contrib/buildsystems/CMakeLists.txt
+5 -1
@@ -152,7 +152,11 @@ endif()
152
153 find_program(MSGFMT_EXE msgfmt)
154 if(NOT MSGFMT_EXE)
155 - message(WARNING "Text Translations won't be build")
155 + set(MSGFMT_EXE ${CMAKE_SOURCE_DIR}/compat/vcbuild/vcpkg/downloads/tools/msys2/msys64/usr/bin/msgfmt.exe)
156 + if(NOT EXISTS ${MSGFMT_EXE})
157 + message(WARNING "Text Translations won't be built")
158 + unset(MSGFMT_EXE)
159 + endif()
160 endif()
161
162 #Force all visual studio outputs to CMAKE_BINARY_DIR