From: "Matthew Rogers via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Philip Oakley <philipoakley@iee.email>,
Sibi Siddharthan <sibisiddharthan.github@gmail.com>,
Johannes Schindelin <johannes.schindelin@gmx.de>,
Danh Doan <congdanhqx@gmail.com>,
Matthew Rogers <mattr94@gmail.com>,
Matthew Rogers <mattr94@gmail.com>
Subject: [PATCH 3/3] cmake: add warning for ignored MSGFMT_EXE
Date: Fri, 04 Jun 2021 17:43:25 +0000 [thread overview]
Message-ID: <07763a9de723af8674b707ba762845fd414bd0a6.1622828605.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.970.git.1622828605.gitgitgadget@gmail.com>
From: Matthew Rogers <mattr94@gmail.com>
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 <johannes.schindelin@gmx.de>
Signed-off-by: Matthew Rogers <mattr94@gmail.com>
---
contrib/buildsystems/CMakeLists.txt | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/contrib/buildsystems/CMakeLists.txt b/contrib/buildsystems/CMakeLists.txt
index 99150c8f5853..ea43a4f9cc9f 100644
--- a/contrib/buildsystems/CMakeLists.txt
+++ b/contrib/buildsystems/CMakeLists.txt
@@ -190,14 +190,18 @@ if(WIN32 AND NOT MSVC)#not required for visual studio builds
endif()
endif()
-find_program(MSGFMT_EXE msgfmt)
-if(NOT MSGFMT_EXE)
- if (USING_VCPKG)
- set(MSGFMT_EXE ${CMAKE_SOURCE_DIR}/compat/vcbuild/vcpkg/downloads/tools/msys2/msys64/usr/bin/msgfmt.exe)
- endif()
- if(NOT EXISTS ${MSGFMT_EXE})
- message(WARNING "Text Translations won't be built")
- unset(MSGFMT_EXE)
+if(NO_GETTEXT)
+ message(STATUS "msgfmt not used under NO_GETTEXT")
+else()
+ find_program(MSGFMT_EXE msgfmt)
+ if(NOT MSGFMT_EXE)
+ if (USING_VCPKG)
+ set(MSGFMT_EXE ${CMAKE_SOURCE_DIR}/compat/vcbuild/vcpkg/downloads/tools/msys2/msys64/usr/bin/msgfmt.exe)
+ endif()
+ if(NOT EXISTS ${MSGFMT_EXE})
+ message(WARNING "Text Translations won't be built")
+ unset(MSGFMT_EXE)
+ endif()
endif()
endif()
--
gitgitgadget
next prev parent reply other threads:[~2021-06-04 17:44 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-04 17:43 [PATCH 0/3] Make CMake work out of the box Matthew Rogers via GitGitGadget
2021-06-04 17:43 ` [PATCH 1/3] cmake: add knob to disable vcpkg Matthew Rogers via GitGitGadget
2021-06-04 18:03 ` Eric Sunshine
2021-06-04 18:34 ` Matt Rogers
2021-06-04 20:55 ` Sibi Siddharthan
2021-06-05 22:30 ` Matt Rogers
2021-06-06 4:33 ` Sibi Siddharthan
2021-06-04 17:43 ` [PATCH 2/3] cmake: create compile_commands.json by default Matthew Rogers via GitGitGadget
2021-06-04 18:05 ` Eric Sunshine
2021-06-04 21:09 ` Sibi Siddharthan
2021-06-05 22:36 ` Matt Rogers
2021-06-06 4:39 ` Sibi Siddharthan
2021-06-04 17:43 ` Matthew Rogers via GitGitGadget [this message]
2021-06-04 18:10 ` [PATCH 3/3] cmake: add warning for ignored MSGFMT_EXE Eric Sunshine
2021-06-05 3:40 ` [PATCH 0/3] Make CMake work out of the box Bagas Sanjaya
2021-06-05 23:22 ` Matt Rogers
2021-06-10 9:43 ` Johannes Schindelin
2021-06-18 13:05 ` Philip Oakley
2021-06-18 13:42 ` Johannes Schindelin
2021-06-18 14:03 ` Philip Oakley
2021-06-22 22:32 ` Johannes Schindelin
2021-06-06 12:02 ` [PATCH v2 " Matthew Rogers via GitGitGadget
2021-06-06 12:02 ` [PATCH v2 1/3] cmake: add knob to disable vcpkg Matthew Rogers via GitGitGadget
2021-06-06 12:02 ` [PATCH v2 2/3] cmake: create compile_commands.json by default Matthew Rogers via GitGitGadget
2021-06-06 12:02 ` [PATCH v2 3/3] cmake: add warning for ignored MSGFMT_EXE Matthew Rogers via GitGitGadget
2021-06-07 0:54 ` [PATCH v2 0/3] Make CMake work out of the box Junio C Hamano
2021-06-10 9:45 ` Johannes Schindelin
2021-06-18 13:11 ` Philip Oakley
2021-06-18 13:09 ` Philip Oakley
2021-06-10 9:47 ` Johannes Schindelin
2021-06-11 6:22 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=07763a9de723af8674b707ba762845fd414bd0a6.1622828605.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=congdanhqx@gmail.com \
--cc=git@vger.kernel.org \
--cc=johannes.schindelin@gmx.de \
--cc=mattr94@gmail.com \
--cc=philipoakley@iee.email \
--cc=sibisiddharthan.github@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).