diff --git a/tests/client/CMakeLists.txt b/tests/client/CMakeLists.txt index a1646f170a..c8cec6f202 100644 --- a/tests/client/CMakeLists.txt +++ b/tests/client/CMakeLists.txt @@ -46,9 +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" -) +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 32e00c9c26..032dcd934c 100644 --- a/tests/libtest/CMakeLists.txt +++ b/tests/libtest/CMakeLists.txt @@ -55,10 +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" -) +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 176c9171ab..8d816ff521 100644 --- a/tests/server/CMakeLists.txt +++ b/tests/server/CMakeLists.txt @@ -42,9 +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" +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 diff --git a/tests/tunit/CMakeLists.txt b/tests/tunit/CMakeLists.txt index c93325f7e0..d1c4396fd3 100644 --- a/tests/tunit/CMakeLists.txt +++ b/tests/tunit/CMakeLists.txt @@ -44,10 +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" -) +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 27cb43ba33..b3f869830f 100644 --- a/tests/unit/CMakeLists.txt +++ b/tests/unit/CMakeLists.txt @@ -44,9 +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" +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 "")