From ba4db300a4832e1f76f62b0c22dbd792eb8b2b8d Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 28 Jun 2025 01:14:57 +0200 Subject: [PATCH] tests: switch to target_compile_definitions() --- tests/client/CMakeLists.txt | 2 +- tests/libtest/CMakeLists.txt | 2 +- tests/server/CMakeLists.txt | 2 +- tests/tunit/CMakeLists.txt | 2 +- tests/unit/CMakeLists.txt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/client/CMakeLists.txt b/tests/client/CMakeLists.txt index c8cec6f202..f8451b847b 100644 --- a/tests/client/CMakeLists.txt +++ b/tests/client/CMakeLists.txt @@ -46,7 +46,7 @@ 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") +target_compile_definitions(TARGET ${BUNDLE} PRIVATE "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 032dcd934c..4a3cc70fc3 100644 --- a/tests/libtest/CMakeLists.txt +++ b/tests/libtest/CMakeLists.txt @@ -55,7 +55,7 @@ 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} "CURL_NO_OLDIES" "CURL_DISABLE_DEPRECATION") +target_compile_definitions(TARGET ${BUNDLE} PRIVATE ${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 8d816ff521..5463256f7f 100644 --- a/tests/server/CMakeLists.txt +++ b/tests/server/CMakeLists.txt @@ -42,7 +42,7 @@ 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" "CURL_NO_OLDIES" +target_compile_definitions(TARGET ${BUNDLE} PRIVATE "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 diff --git a/tests/tunit/CMakeLists.txt b/tests/tunit/CMakeLists.txt index d1c4396fd3..e9c2e6ddb3 100644 --- a/tests/tunit/CMakeLists.txt +++ b/tests/tunit/CMakeLists.txt @@ -44,7 +44,7 @@ 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} "CURL_NO_OLDIES" "CURL_DISABLE_DEPRECATION") +target_compile_definitions(TARGET ${BUNDLE} PRIVATE ${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 b3f869830f..5dcbf48337 100644 --- a/tests/unit/CMakeLists.txt +++ b/tests/unit/CMakeLists.txt @@ -44,7 +44,7 @@ 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} "CURL_NO_OLDIES" "CURL_DISABLE_DEPRECATION" +target_compile_definitions(TARGET ${BUNDLE} PRIVATE ${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 "")