From 464e1e73bcf7583bf1959c4033729886be54f154 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <commit@vsz.me>
Date: Sat, 28 Jun 2025 00:01:49 +0200
Subject: [PATCH] cm defs 1 test

---
 lib/CMakeLists.txt           |  6 ++++--
 tests/client/CMakeLists.txt  |  4 +++-
 tests/libtest/CMakeLists.txt |  6 ++++--
 tests/server/CMakeLists.txt  | 22 +++++++++++-----------
 tests/tunit/CMakeLists.txt   |  6 ++++--
 tests/unit/CMakeLists.txt    |  9 +++++----
 6 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 9b0fda5409..88c28d626f 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -24,8 +24,10 @@
 
 set(LIBCURL_OUTPUT_NAME "${LIB_NAME}" CACHE STRING "Basename of the curl library")
 
-set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS "BUILDING_LIBCURL")
-set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS "${CURL_DEBUG_MACROS}")
+set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS
+  "BUILDING_LIBCURL"
+  ${CURL_DEBUG_MACROS}
+)
 
 configure_file("curl_config.h.cmake" "${CMAKE_CURRENT_BINARY_DIR}/curl_config.h")
 
diff --git a/tests/client/CMakeLists.txt b/tests/client/CMakeLists.txt
index c8cec6f202..a1646f170a 100644
--- a/tests/client/CMakeLists.txt
+++ b/tests/client/CMakeLists.txt
@@ -46,7 +46,9 @@ target_include_directories(${BUNDLE} PRIVATE
   "${PROJECT_SOURCE_DIR}/lib"            # for "curl_setup.h", curlx
   "${CMAKE_CURRENT_SOURCE_DIR}"          # for the generated bundle source to find included test sources
 )
-set_property(TARGET ${BUNDLE} APPEND PROPERTY COMPILE_DEFINITIONS "CURL_NO_OLDIES")
+set_property(TARGET ${BUNDLE} APPEND PROPERTY COMPILE_DEFINITIONS
+  "CURL_NO_OLDIES"
+)
 set_target_properties(${BUNDLE} PROPERTIES OUTPUT_NAME "${BUNDLE}" PROJECT_LABEL "Test ${BUNDLE}" UNITY_BUILD OFF C_CLANG_TIDY "")
 
 curl_add_clang_tidy_test_target("${BUNDLE}-clang-tidy" ${BUNDLE} ${FIRST_C} ${TESTS_C})
diff --git a/tests/libtest/CMakeLists.txt b/tests/libtest/CMakeLists.txt
index 77b69a0a30..32e00c9c26 100644
--- a/tests/libtest/CMakeLists.txt
+++ b/tests/libtest/CMakeLists.txt
@@ -55,8 +55,10 @@ target_include_directories(${BUNDLE} PRIVATE
   "${PROJECT_SOURCE_DIR}/lib"            # for "curl_setup.h", curlx
   "${CMAKE_CURRENT_SOURCE_DIR}"          # for the generated bundle source to find included test sources
 )
-set_property(TARGET ${BUNDLE} APPEND PROPERTY COMPILE_DEFINITIONS "${CURL_DEBUG_MACROS}")
-set_property(TARGET ${BUNDLE} APPEND PROPERTY COMPILE_DEFINITIONS "CURL_NO_OLDIES" "CURL_DISABLE_DEPRECATION")
+set_property(TARGET ${BUNDLE} APPEND PROPERTY COMPILE_DEFINITIONS
+  ${CURL_DEBUG_MACROS}
+  "CURL_NO_OLDIES" "CURL_DISABLE_DEPRECATION"
+)
 set_target_properties(${BUNDLE} PROPERTIES OUTPUT_NAME "${BUNDLE}" PROJECT_LABEL "Test ${BUNDLE}" UNITY_BUILD OFF C_CLANG_TIDY "")
 
 curl_add_clang_tidy_test_target("${BUNDLE}-clang-tidy" ${BUNDLE} ${FIRST_C} ${UTILS_C} ${TESTS_C})
diff --git a/tests/server/CMakeLists.txt b/tests/server/CMakeLists.txt
index 887f8c72ec..176c9171ab 100644
--- a/tests/server/CMakeLists.txt
+++ b/tests/server/CMakeLists.txt
@@ -42,17 +42,17 @@ target_include_directories(${BUNDLE} PRIVATE
   "${PROJECT_SOURCE_DIR}/lib"            # for "curl_setup.h", curlx
   "${CMAKE_CURRENT_SOURCE_DIR}"          # for the generated bundle source to find included test sources
 )
-set_property(TARGET ${BUNDLE} APPEND PROPERTY COMPILE_DEFINITIONS "WITHOUT_LIBCURL")
-set_property(TARGET ${BUNDLE} APPEND PROPERTY COMPILE_DEFINITIONS "CURL_NO_OLDIES")
-# Test servers simply are standalone programs that do not use libcurl
-# library.  For convenience and to ease portability of these servers,
-# some source code files from the libcurl subdirectory are also used
-# to build the servers.  In order to achieve proper linkage of these
-# files on Windows targets it is necessary to build the test servers
-# with CURL_STATICLIB defined, independently of how libcurl is built.
-if(WIN32)
-  set_property(TARGET ${BUNDLE} APPEND PROPERTY COMPILE_DEFINITIONS "CURL_STATICLIB")
-endif()
+set_property(TARGET ${BUNDLE} APPEND PROPERTY COMPILE_DEFINITIONS
+  "WITHOUT_LIBCURL"
+  "CURL_NO_OLDIES"
+  # Test servers simply are standalone programs that do not use libcurl
+  # library.  For convenience and to ease portability of these servers,
+  # some source code files from the libcurl subdirectory are also used
+  # to build the servers.  In order to achieve proper linkage of these
+  # files on Windows targets it is necessary to build the test servers
+  # with CURL_STATICLIB defined, independently of how libcurl is built.
+  "$<$<BOOL:WIN32>:CURL_STATICLIB>"
+)
 set_target_properties(${BUNDLE} PROPERTIES OUTPUT_NAME "${BUNDLE}" PROJECT_LABEL "Test ${BUNDLE}" UNITY_BUILD OFF C_CLANG_TIDY "")
 
 curl_add_clang_tidy_test_target("${BUNDLE}-clang-tidy" ${BUNDLE} ${FIRST_C} ${UTILS_C} ${TESTS_C})
diff --git a/tests/tunit/CMakeLists.txt b/tests/tunit/CMakeLists.txt
index e98b75aef1..c93325f7e0 100644
--- a/tests/tunit/CMakeLists.txt
+++ b/tests/tunit/CMakeLists.txt
@@ -44,8 +44,10 @@ target_include_directories(${BUNDLE} PRIVATE
   "${PROJECT_SOURCE_DIR}/tests/libtest"  # for "first.h", "unitcheck.h"
   "${CMAKE_CURRENT_SOURCE_DIR}"          # for the generated bundle source to find included test sources
 )
-set_property(TARGET ${BUNDLE} APPEND PROPERTY COMPILE_DEFINITIONS "${CURL_DEBUG_MACROS}")
-set_property(TARGET ${BUNDLE} APPEND PROPERTY COMPILE_DEFINITIONS "CURL_NO_OLDIES" "CURL_DISABLE_DEPRECATION")
+set_property(TARGET ${BUNDLE} APPEND PROPERTY COMPILE_DEFINITIONS
+  ${CURL_DEBUG_MACROS}
+  "CURL_NO_OLDIES" "CURL_DISABLE_DEPRECATION"
+)
 set_target_properties(${BUNDLE} PROPERTIES OUTPUT_NAME "${BUNDLE}" PROJECT_LABEL "Test ${BUNDLE}" UNITY_BUILD OFF C_CLANG_TIDY "")
 
 curl_add_clang_tidy_test_target("${BUNDLE}-clang-tidy" ${BUNDLE} ${FIRST_C} ${TESTS_C})
diff --git a/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt
index 71bb680e78..27cb43ba33 100644
--- a/tests/unit/CMakeLists.txt
+++ b/tests/unit/CMakeLists.txt
@@ -44,10 +44,11 @@ target_include_directories(${BUNDLE} PRIVATE
   "${PROJECT_SOURCE_DIR}/tests/libtest"  # for "first.h", "unitcheck.h"
   "${CMAKE_CURRENT_SOURCE_DIR}"          # for the generated bundle source to find included test sources
 )
-set_property(TARGET ${BUNDLE} APPEND PROPERTY COMPILE_DEFINITIONS "${CURL_DEBUG_MACROS}")
-set_property(TARGET ${BUNDLE} APPEND PROPERTY COMPILE_DEFINITIONS "CURL_NO_OLDIES" "CURL_DISABLE_DEPRECATION")
-# unit tests are small pretend-libcurl-programs
-set_property(TARGET ${BUNDLE} APPEND PROPERTY COMPILE_DEFINITIONS "BUILDING_LIBCURL")
+set_property(TARGET ${BUNDLE} APPEND PROPERTY COMPILE_DEFINITIONS
+  ${CURL_DEBUG_MACROS}
+  "CURL_NO_OLDIES" "CURL_DISABLE_DEPRECATION"
+  "BUILDING_LIBCURL"  # unit tests are small pretend-libcurl-programs
+)
 set_target_properties(${BUNDLE} PROPERTIES OUTPUT_NAME "${BUNDLE}" PROJECT_LABEL "Test ${BUNDLE}" UNITY_BUILD OFF C_CLANG_TIDY "")
 
 curl_add_clang_tidy_test_target("${BUNDLE}-clang-tidy" ${BUNDLE} ${FIRST_C} ${TESTS_C})