From: Junio C Hamano <gitster@pobox.com>
To: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: Re: [PATCH] cmake: adapt to the Git Standard Library
Date: Tue, 27 Feb 2024 10:40:32 -0800 [thread overview]
Message-ID: <xmqqcyshsqcf.fsf@gitster.g> (raw)
In-Reply-To: <pull.1677.git.1709045045235.gitgitgadget@gmail.com> (Johannes Schindelin via GitGitGadget's message of "Tue, 27 Feb 2024 14:44:04 +0000")
"Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
writes:
> From: Johannes Schindelin <johannes.schindelin@gmx.de>
>
> In the commit "git-std-lib: introduce Git Standard Library" of the
> `cw/git-std-lib` topic, the Makefile was restructured in a manner that
> requires the CMake definition to follow suit to be able to build Git.
>
> This commit adjusts the CMake definition accordingly.
>
> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> ---
> cmake: adapt to the Git Standard Library
>
> The usual CMake adjustments. This is based on cw/git-std-lib.
Thanks for a fix.
std-lib folks, can you fold this patch (with authorship credits
intact) into your series when it gets rerolled from here on?
Thanks.
> Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1677%2Fdscho%2Fcmake-vs-git-std-lib-v1
> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1677/dscho/cmake-vs-git-std-lib-v1
> Pull-Request: https://github.com/gitgitgadget/git/pull/1677
>
> contrib/buildsystems/CMakeLists.txt | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/contrib/buildsystems/CMakeLists.txt b/contrib/buildsystems/CMakeLists.txt
> index 804629c525b..6f46f8f9070 100644
> --- a/contrib/buildsystems/CMakeLists.txt
> +++ b/contrib/buildsystems/CMakeLists.txt
> @@ -676,10 +676,12 @@ include_directories(${CMAKE_BINARY_DIR})
> #build
> #libgit
> parse_makefile_for_sources(libgit_SOURCES "LIB_OBJS")
> +parse_makefile_for_sources(std_lib_SOURCES "STD_LIB_OBJS")
>
> list(TRANSFORM libgit_SOURCES PREPEND "${CMAKE_SOURCE_DIR}/")
> +list(TRANSFORM std_lib_SOURCES PREPEND "${CMAKE_SOURCE_DIR}/")
> list(TRANSFORM compat_SOURCES PREPEND "${CMAKE_SOURCE_DIR}/")
> -add_library(libgit ${libgit_SOURCES} ${compat_SOURCES})
> +add_library(libgit ${libgit_SOURCES} ${std_lib_SOURCES} ${compat_SOURCES})
>
> #libxdiff
> parse_makefile_for_sources(libxdiff_SOURCES "XDIFF_OBJS")
>
> base-commit: c9e04a1e1f954dd60b1373f75b710f64d34e502b
next prev parent reply other threads:[~2024-02-27 18:40 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-27 14:44 [PATCH] cmake: adapt to the Git Standard Library Johannes Schindelin via GitGitGadget
2024-02-27 18:40 ` Junio C Hamano [this message]
2024-02-27 23:10 ` Junio C Hamano
2024-02-27 23:14 ` Calvin Wan
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=xmqqcyshsqcf.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=johannes.schindelin@gmx.de \
/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).