From: Patrick Steinhardt <ps@pks.im>
To: git@vger.kernel.org
Cc: Ed Reel <edreel@gmail.com>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Taylor Blau <me@ttaylorr.com>
Subject: [PATCH v2 0/3] cmake: fix autogenerated clar headers
Date: Tue, 15 Oct 2024 11:46:08 +0200 [thread overview]
Message-ID: <cover.1728985514.git.ps@pks.im> (raw)
In-Reply-To: <CAGjHeYfyH+cOMYYYHnFR+Vu9T+RbmzO1SpB_-kbmBSf1DitJhA@mail.gmail.com>
Hi,
this is the second version of this patch series that fixes building clar
with the CMake build system.
Changes compared to v1:
- Use a for loop instead of `while; shift`.
- Provide a bit more context around the PRIVATE/PUBLIC switch in the
commit message.
Thanks!
Patrick
Patrick Steinhardt (3):
Makefile: extract script to generate clar declarations
cmake: fix compilation of clar-based unit tests
cmake: set up proper dependencies for generated clar headers
Makefile | 4 +--
contrib/buildsystems/CMakeLists.txt | 52 ++++++++---------------------
t/unit-tests/generate-clar-decls.sh | 16 +++++++++
3 files changed, 30 insertions(+), 42 deletions(-)
create mode 100755 t/unit-tests/generate-clar-decls.sh
Range-diff against v1:
1: 346aa2f0830 ! 1: 7a619677c7a Makefile: extract script to generate clar declarations
@@ t/unit-tests/generate-clar-decls.sh (new)
+OUTPUT="$1"
+shift
+
-+while test "$#" -ne 0
++for suite in "$@"
+do
-+ suite="$1"
-+ shift
+ sed -ne "s/^\(void test_$suite__[a-zA-Z_0-9][a-zA-Z_0-9]*(void)$\)/extern \1;/p" "$suite" ||
+ exit 1
+done >"$OUTPUT"
2: b9afeffda29 ! 2: 447afc4a0f3 cmake: fix compilation of clar-based unit tests
@@ Commit message
"clar.suite" files as include directories. Instead, we accidentally set
up the source directory as include directory.
- Fix this and propagate the include directories of "unit-tests.lib" to
- the "unit-tests" executable so that the latter uses the same include
- directories.
+ Fix this by including the binary directory instead of the source
+ directory. Furthermore, set up the include directories as PUBLIC instead
+ of PRIVATE such that they propagate from "unit-tests.lib" to the
+ "unit-tests" executable, which needs to include the same directory.
Reported-by: Ed Reel <edreel@gmail.com>
Signed-off-by: Patrick Steinhardt <ps@pks.im>
3: 129d28ae48a = 3: cf4955b2ddc cmake: set up proper dependencies for generated clar headers
--
2.47.0.72.gef8ce8f3d4.dirty
next prev parent reply other threads:[~2024-10-15 9:46 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-09 3:23 Bug report Ed Reel
2024-10-14 6:10 ` Johannes Schindelin
2024-10-14 14:06 ` [PATCH 0/3] cmake: fix autogenerated clar headers Patrick Steinhardt
2024-10-14 14:06 ` [PATCH 1/3] Makefile: extract script to generate clar declarations Patrick Steinhardt
2024-10-14 21:42 ` Taylor Blau
2024-10-15 9:08 ` Patrick Steinhardt
2024-10-14 14:06 ` [PATCH 2/3] cmake: fix compilation of clar-based unit tests Patrick Steinhardt
2024-10-14 21:46 ` Taylor Blau
2024-10-15 9:09 ` Patrick Steinhardt
2024-10-14 14:06 ` [PATCH 3/3] cmake: set up proper dependencies for generated clar headers Patrick Steinhardt
2024-10-14 21:47 ` Taylor Blau
2024-10-14 21:40 ` [PATCH 0/3] cmake: fix autogenerated " Taylor Blau
2024-10-15 9:46 ` Patrick Steinhardt [this message]
2024-10-15 9:46 ` [PATCH v2 1/3] Makefile: extract script to generate clar declarations Patrick Steinhardt
2024-10-15 19:24 ` Taylor Blau
2024-10-18 15:21 ` Toon Claes
2024-10-21 6:59 ` Patrick Steinhardt
2024-10-15 9:46 ` [PATCH v2 2/3] cmake: fix compilation of clar-based unit tests Patrick Steinhardt
2024-10-15 9:46 ` [PATCH v2 3/3] cmake: set up proper dependencies for generated clar headers Patrick Steinhardt
2024-10-15 19:25 ` [PATCH v2 0/3] cmake: fix autogenerated " Taylor Blau
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=cover.1728985514.git.ps@pks.im \
--to=ps@pks.im \
--cc=Johannes.Schindelin@gmx.de \
--cc=edreel@gmail.com \
--cc=git@vger.kernel.org \
--cc=me@ttaylorr.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.