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

In 7e0730c8baa (t: better support for out-of-tree builds, 2024-12-06),
the `bin-wrappers/` strategy was changed so that it no longer hard-codes
the template directory to be `@BUILD_DIR@/templates/blt`, but instead
interpolates the `@TEMPLATE_DIR@` placeholder during the build.

However, this commit only adjusted the `Makefile`-based build.

Let's adjust the CMake-based build as well. This fixes t0000.15 which
would otherwise fail with:

  ++ echo ''\''t1234-verbose/err'\'' is not empty, it contains:'
  't1234-verbose/err' is not empty, it contains:
  ++ cat t1234-verbose/err
  warning: templates not found in @TEMPLATE_DIR@

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