From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: Matthew Rogers via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org, Eric Sunshine <sunshine@sunshineco.com>,
Sibi Siddharthan <sibisiddharthan.github@gmail.com>,
Bagas Sanjaya <bagasdotme@gmail.com>,
Matthew Rogers <mattr94@gmail.com>
Subject: Re: [PATCH v2 0/3] Make CMake work out of the box
Date: Thu, 10 Jun 2021 11:45:27 +0200 (CEST) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.2106101144050.57@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <xmqqpmwywl2z.fsf@gitster.g>
Hi Junio,
On Mon, 7 Jun 2021, Junio C Hamano wrote:
> "Matthew Rogers via GitGitGadget" <gitgitgadget@gmail.com> writes:
>
> > This pull request comes from our discussion here[1], and I think these
> > patches provide a good compromise around the concerns discussed there
> >
> > 1:
> > https://lore.kernel.org/git/CAOjrSZusMSvs7AS-ZDsV8aQUgsF2ZA754vSDjgFKMRgi_oZAWw@mail.gmail.com/
> >
> > CCing the people involved in the original discussion. cc: Philip Oakley
> > philipoakley@iee.email cc: Sibi Siddharthan
> > sibisiddharthan.github@gmail.com, cc: Johannes Schindelin
> > johannes.schindelin@gmx.de, cc: Danh Doan congdanhqx@gmail.com
> >
> > Matthew Rogers (3):
> > cmake: add knob to disable vcpkg
> > cmake: create compile_commands.json by default
> > cmake: add warning for ignored MSGFMT_EXE
>
> I am neither cmake nor windows person, so I'll queue this as-is and
> wait for the stakeholders to chime in.
As long as the CI builds pass, I am in favor of integrating the patch
series.
> I did wonder if we want this to be applicable to the maintenance
> track for 2.31, though. There is a textual conflict with the
> addition of SIMPLE_IPC that happened during 2.32 cycle, which is
> easily resolvable.
If it isn't much work, sure. But I would think that developers who want to
build using Visual Studio really should stay on newer branches.
Thanks,
Dscho
> I am tempted to queue a version of these three patches rebased on to
> 'maint' after making sure that the result of merging that into
> 'master' is byte-for-byte identical to applying these three patches
> directly on to 'master'.
>
> The range-diff looks like the attached. Thanks.
>
> 1: 546c49cc88 ! 1: 585b7ca371 cmake: add knob to disable vcpkg
> @@ contrib/buildsystems/CMakeLists.txt: endif()
> if(NOT EXISTS ${MSGFMT_EXE})
> message(WARNING "Text Translations won't be built")
> unset(MSGFMT_EXE)
> -@@ contrib/buildsystems/CMakeLists.txt: file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "X='${EXE_EXTENSION}'\n")
> - file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "NO_GETTEXT='${NO_GETTEXT}'\n")
> +@@ contrib/buildsystems/CMakeLists.txt: file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "NO_GETTEXT='${NO_GETTEXT}'\n"
> file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "RUNTIME_PREFIX='${RUNTIME_PREFIX}'\n")
> file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "NO_PYTHON='${NO_PYTHON}'\n")
> + file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "SUPPORTS_SIMPLE_IPC='${SUPPORTS_SIMPLE_IPC}'\n")
> -if(WIN32)
> +if(USE_VCPKG)
> file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "PATH=\"$PATH:$TEST_DIRECTORY/../compat/vcbuild/vcpkg/installed/x64-windows/bin\"\n")
> 2: efa8681a22 = 2: 1cba2f9bd1 cmake: create compile_commands.json by default
> 3: ceeca2bc0d = 3: 7824e74976 cmake: add warning for ignored MSGFMT_EXE
>
next prev parent reply other threads:[~2021-06-10 9:45 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 ` [PATCH 3/3] cmake: add warning for ignored MSGFMT_EXE Matthew Rogers via GitGitGadget
2021-06-04 18:10 ` 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 [this message]
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=nycvar.QRO.7.76.6.2106101144050.57@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=bagasdotme@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=mattr94@gmail.com \
--cc=sibisiddharthan.github@gmail.com \
--cc=sunshine@sunshineco.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).