Re: [PATCH] cmake: fix build of `t-oidtree`
Hi,
now Cc:ing Ghanshyam correctly. Sorry for that.
On Fri, 12 Jul 2024, Johannes Schindelin via GitGitGadget wrote:
Show 47 quoted lines
> 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
>