git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, Ghanshyam Thakkar <shyamthakkar001@gmail.com>
Subject: Re: [PATCH] cmake: fix build of `t-oidtree`
Date: Fri, 12 Jul 2024 22:46:38 +0200 (CEST)	[thread overview]
Message-ID: <d6bb6432-b10b-a665-1dc0-1a4df4a6495c@gmx.de> (raw)
In-Reply-To: <pull.1761.git.1720816450344.gitgitgadget@gmail.com>

Hi,

now Cc:ing Ghanshyam correctly. Sorry for that.

On Fri, 12 Jul 2024, Johannes Schindelin via GitGitGadget wrote:

> From: Johannes Schindelin <johannes.schindelin@gmx.de>
>
> When the `oidtree` test helper was turned into a unit test, a new
> `lib-oid` source file was added as dependency. This was only done in the
> Makefile so far, but also needs to be done in the CMake definition.
>
> This is a companion of ed548408723d (t/: migrate helper/test-oidtree.c
> to unit-tests/t-oidtree.c, 2024-06-08).
>
> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> ---
>     cmake: fix build of t-oidtree
>
>     This is based on the gt/unit-test-oidtree branch.
>
>     /cc "Ghanshyam Thakkar" shyamthakkar001@gmail.com
>
> Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1761%2Fdscho%2Fcmake-vs-t-oidtree-v1
> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1761/dscho/cmake-vs-t-oidtree-v1
> Pull-Request: https://github.com/gitgitgadget/git/pull/1761
>
>  contrib/buildsystems/CMakeLists.txt | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/contrib/buildsystems/CMakeLists.txt b/contrib/buildsystems/CMakeLists.txt
> index 2f9c33585c6..832f46b316b 100644
> --- a/contrib/buildsystems/CMakeLists.txt
> +++ b/contrib/buildsystems/CMakeLists.txt
> @@ -976,11 +976,12 @@ list(TRANSFORM test-reftable_SOURCES PREPEND "${CMAKE_SOURCE_DIR}/")
>
>  #unit-tests
>  add_library(unit-test-lib OBJECT ${CMAKE_SOURCE_DIR}/t/unit-tests/test-lib.c)
> +add_library(unit-test-lib-oid OBJECT ${CMAKE_SOURCE_DIR}/t/unit-tests/lib-oid.c)
>
>  parse_makefile_for_scripts(unit_test_PROGRAMS "UNIT_TEST_PROGRAMS" "")
>  foreach(unit_test ${unit_test_PROGRAMS})
>  	add_executable("${unit_test}" "${CMAKE_SOURCE_DIR}/t/unit-tests/${unit_test}.c")
> -	target_link_libraries("${unit_test}" unit-test-lib common-main)
> +	target_link_libraries("${unit_test}" unit-test-lib unit-test-lib-oid common-main)
>  	set_target_properties("${unit_test}"
>  		PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/t/unit-tests/bin)
>  	if(MSVC)
>
> base-commit: ed548408723d6e969160279398cc47f88f5700bc
> --
> gitgitgadget
>

  reply	other threads:[~2024-07-12 20:46 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-07-12 20:34 [PATCH] cmake: fix build of `t-oidtree` Johannes Schindelin via GitGitGadget
2024-07-12 20:46 ` Johannes Schindelin [this message]
2024-07-12 21:38 ` Junio C Hamano
2024-07-12 23:04   ` Ghanshyam Thakkar
2024-07-13  1:14     ` Junio C Hamano
2024-07-24 10:19     ` Johannes Schindelin

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=d6bb6432-b10b-a665-1dc0-1a4df4a6495c@gmx.de \
    --to=johannes.schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=gitgitgadget@gmail.com \
    --cc=shyamthakkar001@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.
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 NNTP newsgroup(s).