From 69642330a3673364ba873fc1aabab5e85fa8da79 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Thu, 19 Jun 2025 11:52:50 +0200 Subject: [PATCH] cmake: sync `target_link_libraries()` order in tests more Closes #17669 --- tests/client/CMakeLists.txt | 2 +- tests/libtest/CMakeLists.txt | 2 +- tests/server/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/client/CMakeLists.txt b/tests/client/CMakeLists.txt index 05f83af868..167b55c969 100644 --- a/tests/client/CMakeLists.txt +++ b/tests/client/CMakeLists.txt @@ -42,12 +42,12 @@ add_custom_command(OUTPUT "${BUNDLE_SRC}" add_executable(${BUNDLE} EXCLUDE_FROM_ALL "${BUNDLE_SRC}") add_dependencies(testdeps ${BUNDLE}) +target_link_libraries(${BUNDLE} ${LIB_SELECTED} ${CURL_LIBS}) target_include_directories(${BUNDLE} PRIVATE "${PROJECT_BINARY_DIR}/lib" # for "curl_config.h" "${PROJECT_SOURCE_DIR}/lib" # for "curl_setup.h" "${PROJECT_SOURCE_DIR}/lib/curlx" # for curlx "${CMAKE_CURRENT_SOURCE_DIR}" # for "first.h" ) -target_link_libraries(${BUNDLE} ${LIB_SELECTED} ${CURL_LIBS}) 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) diff --git a/tests/libtest/CMakeLists.txt b/tests/libtest/CMakeLists.txt index 26138a3c9e..45a533acaa 100644 --- a/tests/libtest/CMakeLists.txt +++ b/tests/libtest/CMakeLists.txt @@ -49,6 +49,7 @@ add_custom_command(OUTPUT "${BUNDLE_SRC}" add_executable(${BUNDLE} EXCLUDE_FROM_ALL "${BUNDLE_SRC}") add_dependencies(testdeps ${BUNDLE}) +target_link_libraries(${BUNDLE} ${LIB_SELECTED} ${CURL_LIBS}) target_include_directories(${BUNDLE} PRIVATE "${PROJECT_BINARY_DIR}/lib" # for "curl_config.h" "${PROJECT_SOURCE_DIR}/lib" # for "curl_setup.h" @@ -57,7 +58,6 @@ target_include_directories(${BUNDLE} PRIVATE "${PROJECT_SOURCE_DIR}/tests/libtest" # to be able to build generated tests "${PROJECT_SOURCE_DIR}/tests/unit" # for curlcheck.h ) -target_link_libraries(${BUNDLE} ${LIB_SELECTED} ${CURL_LIBS}) 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_target_properties(${BUNDLE} PROPERTIES OUTPUT_NAME "${BUNDLE}" PROJECT_LABEL "Test ${BUNDLE}" UNITY_BUILD OFF) diff --git a/tests/server/CMakeLists.txt b/tests/server/CMakeLists.txt index d95a648303..c0be8a96c2 100644 --- a/tests/server/CMakeLists.txt +++ b/tests/server/CMakeLists.txt @@ -37,6 +37,7 @@ add_custom_command(OUTPUT "${BUNDLE_SRC}" add_executable(${BUNDLE} EXCLUDE_FROM_ALL "${BUNDLE_SRC}") add_dependencies(testdeps ${BUNDLE}) +target_link_libraries(${BUNDLE} ${CURL_LIBS}) target_include_directories(${BUNDLE} PRIVATE "${PROJECT_BINARY_DIR}/lib" # for "curl_config.h" "${PROJECT_SOURCE_DIR}/lib" # for "curl_setup.h" @@ -44,7 +45,6 @@ target_include_directories(${BUNDLE} PRIVATE "${PROJECT_SOURCE_DIR}/src" # for "tool_binmode.h", "tool_xattr.h" "${PROJECT_SOURCE_DIR}/tests/server" # for "first.h" ) -target_link_libraries(${BUNDLE} ${CURL_LIBS}) 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