From eb2d037dd9fca6029d9f83467b21519b0708e911 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <commit@vsz.me>
Date: Wed, 3 Sep 2025 14:36:33 +0200
Subject: [PATCH] fixups

---
 CMakeLists.txt     | 7 +++++--
 lib/CMakeLists.txt | 2 +-
 src/CMakeLists.txt | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 59d559ddff..e0eb94500b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -313,13 +313,16 @@ endif()
 
 option(CURL_CODE_COVERAGE "Enable code coverage build options" OFF)
 if(CURL_CODE_COVERAGE)
+  set(CURL_COVERAGE_MACROS "")
   set(CURL_CFLAGS_COVERAGE "")
   set(CURL_LIBS_COVERAGE "")
   if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
-    string(APPEND CURL_CFLAGS_COVERAGE " -DNDEBUG -O0 -g -fprofile-arcs -ftest-coverage")
+    list(APPEND CURL_COVERAGE_MACROS "NDEBUG")
+    list(APPEND CURL_CFLAGS_COVERAGE "-O0" "-g" "-fprofile-arcs" "-ftest-coverage")
     list(APPEND CURL_LIBS_COVERAGE "gcov")
   elseif(CMAKE_C_COMPILER_ID MATCHES "Clang")
-    string(APPEND CURL_CFLAGS_COVERAGE " -DNDEBUG -O0 -g -fprofile-arcs -ftest-coverage")
+    list(APPEND CURL_COVERAGE_MACROS "NDEBUG")
+    list(APPEND CURL_CFLAGS_COVERAGE "-O0" "-g" "-fprofile-arcs" "-ftest-coverage")
     list(APPEND CURL_LIBS_COVERAGE "llvm-gcov")
   endif()
 endif()
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 3e30019911..1abbad362c 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -24,7 +24,7 @@
 
 set(LIBCURL_OUTPUT_NAME "${LIB_NAME}" CACHE STRING "Basename of the curl library")
 
-set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS ${CURL_DEBUG_MACROS} "BUILDING_LIBCURL")
+set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS ${CURL_DEBUG_MACROS} ${CURL_COVERAGE_MACROS} "BUILDING_LIBCURL")
 set_property(DIRECTORY APPEND PROPERTY COMPILE_OPTIONS ${CURL_CFLAGS_COVERAGE})
 
 configure_file("curl_config.h.cmake" "${CMAKE_CURRENT_BINARY_DIR}/curl_config.h")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 90c4ec96db..8d59802ad9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -22,7 +22,7 @@
 #
 ###########################################################################
 
-set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS "${CURL_DEBUG_MACROS}")
+set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS ${CURL_DEBUG_MACROS} ${CURL_COVERAGE_MACROS})
 set_property(DIRECTORY APPEND PROPERTY COMPILE_OPTIONS ${CURL_CFLAGS_COVERAGE})
 
 set(_curl_cfiles_gen "")