Skip to content

Commit 8f45138

Browse files
dschogitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent e18ae4e commit 8f45138

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

contrib/buildsystems/CMakeLists.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,11 @@ endif()
152152

153153
find_program(MSGFMT_EXE msgfmt)
154154
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()
156160
endif()
157161

158162
#Force all visual studio outputs to CMAKE_BINARY_DIR

0 commit comments

Comments
 (0)