]> git.ipfire.org Git - thirdparty/git.git/commit
cmake(mergetools): better support for out-of-tree builds
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Tue, 17 Dec 2024 17:31:58 +0000 (17:31 +0000)
committerJunio C Hamano <gitster@pobox.com>
Tue, 17 Dec 2024 20:48:53 +0000 (12:48 -0800)
commitdf87d53e941f8d7af4d60018b24eeb845a01c355
treee9f94459c0c7d05d9c84d142d027cabd0430255c
parentc1c5b03afc156d502ec68e6bd7f69adf4cbe3367
cmake(mergetools): better support for out-of-tree builds

In 7e0730c8baa (t: better support for out-of-tree builds, 2024-12-06)
the strategy was changed from letting `t7609-mergetool--lib.sh`
hard-code the directory where it expects to find the merge tools to
hard-coding that value in the placeholder `@GIT_TEST_MERGE_TOOLS_DIR@`
that is replaced during the build.

However, likely due to a copy/paste mistake (and reviewers missed this,
too), the CMake-based build was adjusted incorrectly, replacing that
placeholder not with the path to the merge tools, but with a Boolean
indicating whether to use a runtime-generated path prefix or not.

Let's fix that, addressing this CMake-build's symptom:

  Initialized empty Git repository in D:/a/git/git/t/trash directory.t7609-mergetool--lib/.git/
  ++ . true/vimdiff
  ./test-lib.sh: line 1021: true/vimdiff: No such file or directory

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
contrib/buildsystems/CMakeLists.txt