Re: [PATCH v2 3/4] cmake: use verbatim arguments when invoking clar commands

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi Johannes

On 13/11/2024 15:41, Johannes Schindelin wrote:

I would not be surprised if this `VERBATIM` was unaware of the quirky
escaping that the MSYS2 runtime (and therefore the Bash) requires. See the
commit message of ad1559252945 (tests: add a helper to stress test
argument quoting, 2019-09-18) for details.

Having said that, this patch certainly does not make things _worse_, even
if it probably does not have the intended effect on Windows. But then, it
does not matter because most git/git source checkouts live at absolute
paths that do not need to be quoted.

It may not be perfect but it is an improvement on Windows. When I was playing around with

	COMMAND ${SH_EXE} -c [[awk -f "$1" "$2" >"$3"]] ...

to build clar.suite on Windows it failed to work without VERBATIM.

Best Wishes

Phillip

Ciao,
Johannes


Signed-off-by: Patrick Steinhardt <ps@xxxxxx>
---
  contrib/buildsystems/CMakeLists.txt | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/contrib/buildsystems/CMakeLists.txt b/contrib/buildsystems/CMakeLists.txt
index 2db80b7cc3c6aba840f18ffdc78d2cda1877d8cd..8c71f5a1d0290c9204e094fb266f10c7b70af9fb 100644
--- a/contrib/buildsystems/CMakeLists.txt
+++ b/contrib/buildsystems/CMakeLists.txt
@@ -1009,13 +1009,15 @@ add_custom_command(OUTPUT "${CMAKE_BINARY_DIR}/t/unit-tests/clar-decls.h"
  		"${CMAKE_BINARY_DIR}/t/unit-tests/clar-decls.h"
  		${clar_test_SUITES}
  	DEPENDS ${CMAKE_SOURCE_DIR}/t/unit-tests/generate-clar-decls.sh
-		${clar_test_SUITES})
+		${clar_test_SUITES}
+	VERBATIM)
  add_custom_command(OUTPUT "${CMAKE_BINARY_DIR}/t/unit-tests/clar.suite"
  	COMMAND ${SH_EXE} "${CMAKE_SOURCE_DIR}/t/unit-tests/generate-clar-suites.sh"
  		"${CMAKE_BINARY_DIR}/t/unit-tests/clar-decls.h"
  		"${CMAKE_BINARY_DIR}/t/unit-tests/clar.suite"
  	DEPENDS "${CMAKE_SOURCE_DIR}/t/unit-tests/generate-clar-suites.sh"
-		"${CMAKE_BINARY_DIR}/t/unit-tests/clar-decls.h")
+		"${CMAKE_BINARY_DIR}/t/unit-tests/clar-decls.h"
+	VERBATIM)

  add_library(unit-tests-lib ${clar_test_SUITES}
  	"${CMAKE_SOURCE_DIR}/t/unit-tests/clar/clar.c"

--
2.47.0.229.g8f8d6eee53.dirty







[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux