summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2020-09-30 15:26:18 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-09-30 20:25:59 (GMT)
commit8f4513872517b72fb49d914ee9af8d44c836fc5a (patch)
tree2fd8645c41b3bc6f4395ffdb1ad5b9a952ee5c84
parente18ae4e7a6cd687ba9dac8be1e88a3d99f676fd5 (diff)
downloadgit-8f4513872517b72fb49d914ee9af8d44c836fc5a.zip
git-8f4513872517b72fb49d914ee9af8d44c836fc5a.tar.gz
git-8f4513872517b72fb49d914ee9af8d44c836fc5a.tar.bz2
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>
-rw-r--r--contrib/buildsystems/CMakeLists.txt6
1 files changed, 5 insertions, 1 deletions
diff --git a/contrib/buildsystems/CMakeLists.txt b/contrib/buildsystems/CMakeLists.txt
index 12268f6..02241dc 100644
--- a/contrib/buildsystems/CMakeLists.txt
+++ b/contrib/buildsystems/CMakeLists.txt
@@ -152,7 +152,11 @@ endif()
find_program(MSGFMT_EXE msgfmt)
if(NOT MSGFMT_EXE)
- message(WARNING "Text Translations won't be build")
+ set(MSGFMT_EXE ${CMAKE_SOURCE_DIR}/compat/vcbuild/vcpkg/downloads/tools/msys2/msys64/usr/bin/msgfmt.exe)
+ if(NOT EXISTS ${MSGFMT_EXE})
+ message(WARNING "Text Translations won't be built")
+ unset(MSGFMT_EXE)
+ endif()
endif()
#Force all visual studio outputs to CMAKE_BINARY_DIR