Skip to content

Commit ce24797

Browse files
ROGERSM94gitster
authored andcommitted
cmake: add warning for ignored MSGFMT_EXE
It does not make sense to attempt to set MSGFMT_EXE when NO_GETTEXT is configured, as such add a check for NO_GETTEXT before attempting to set it. Suggested-by: Johannes Schindelin <[email protected]> Signed-off-by: Matthew Rogers <[email protected]> Acked-by: Johannes Schindelin <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 409047a commit ce24797

File tree

1 file changed

+12
-8
lines changed

1 file changed

+12
-8
lines changed

contrib/buildsystems/CMakeLists.txt

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -185,14 +185,18 @@ if(WIN32 AND NOT MSVC)#not required for visual studio builds
185185
endif()
186186
endif()
187187

188-
find_program(MSGFMT_EXE msgfmt)
189-
if(NOT MSGFMT_EXE)
190-
if (USE_VCPKG)
191-
set(MSGFMT_EXE ${CMAKE_SOURCE_DIR}/compat/vcbuild/vcpkg/downloads/tools/msys2/msys64/usr/bin/msgfmt.exe)
192-
endif()
193-
if(NOT EXISTS ${MSGFMT_EXE})
194-
message(WARNING "Text Translations won't be built")
195-
unset(MSGFMT_EXE)
188+
if(NO_GETTEXT)
189+
message(STATUS "msgfmt not used under NO_GETTEXT")
190+
else()
191+
find_program(MSGFMT_EXE msgfmt)
192+
if(NOT MSGFMT_EXE)
193+
if(USE_VCPKG)
194+
set(MSGFMT_EXE ${CMAKE_SOURCE_DIR}/compat/vcbuild/vcpkg/downloads/tools/msys2/msys64/usr/bin/msgfmt.exe)
195+
endif()
196+
if(NOT EXISTS ${MSGFMT_EXE})
197+
message(WARNING "Text Translations won't be built")
198+
unset(MSGFMT_EXE)
199+
endif()
196200
endif()
197201
endif()
198202

0 commit comments

Comments
 (0)