diff mbox series

[v3,11/11] cmake: fix typo in message when `msgfmt` was not found

Message ID c3e235fe39b41b90a8a00d81220cb28e83580f13.1601327357.git.gitgitgadget@gmail.com (mailing list archive)
State Superseded
Headers show
Series CMake and Visual Studio | expand

Commit Message

Philippe Blain via GitGitGadget Sept. 28, 2020, 9:09 p.m. UTC
From: Johannes Schindelin <johannes.schindelin@gmx.de>

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 contrib/buildsystems/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Junio C Hamano Sept. 28, 2020, 10:11 p.m. UTC | #1
"Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
writes:

> From: Johannes Schindelin <johannes.schindelin@gmx.de>
>
> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> ---

Shouldn't this be squashed into the step being fixed, which is part
of this series?  Would it be the "fall back to using..." step (4/11)?

>  contrib/buildsystems/CMakeLists.txt | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/contrib/buildsystems/CMakeLists.txt b/contrib/buildsystems/CMakeLists.txt
> index 4b16744847..b9fced682e 100644
> --- a/contrib/buildsystems/CMakeLists.txt
> +++ b/contrib/buildsystems/CMakeLists.txt
> @@ -166,7 +166,7 @@ find_program(MSGFMT_EXE msgfmt)
>  if(NOT MSGFMT_EXE)
>  	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 build")
> +		message(WARNING "Text Translations won't be built")
>  		unset(MSGFMT_EXE)
>  	endif()
>  endif()
Johannes Schindelin Sept. 29, 2020, 12:07 p.m. UTC | #2
Hi Junio,

On Mon, 28 Sep 2020, Junio C Hamano wrote:

> "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
> writes:
>
> > From: Johannes Schindelin <johannes.schindelin@gmx.de>
> >
> > Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> > ---
>
> Shouldn't this be squashed into the step being fixed, which is part
> of this series?  Would it be the "fall back to using..." step (4/11)?

Oy. I did not even realize that it was _my_ typo. Fixed in my branch. I'll
wait a little, just in case that anything else needs to be fixed, before
sending the next iteration.

Ciao,
Dscho
diff mbox series

Patch

diff --git a/contrib/buildsystems/CMakeLists.txt b/contrib/buildsystems/CMakeLists.txt
index 4b16744847..b9fced682e 100644
--- a/contrib/buildsystems/CMakeLists.txt
+++ b/contrib/buildsystems/CMakeLists.txt
@@ -166,7 +166,7 @@  find_program(MSGFMT_EXE msgfmt)
 if(NOT MSGFMT_EXE)
 	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 build")
+		message(WARNING "Text Translations won't be built")
 		unset(MSGFMT_EXE)
 	endif()
 endif()