]> git.ipfire.org Git - thirdparty/curl.git/commitdiff
cmake: sync `target_link_libraries()` order in tests more
authorViktor Szakats <commit@vsz.me>
Thu, 19 Jun 2025 09:52:50 +0000 (11:52 +0200)
committerViktor Szakats <commit@vsz.me>
Thu, 19 Jun 2025 10:14:55 +0000 (12:14 +0200)
Closes #17669

tests/client/CMakeLists.txt
tests/libtest/CMakeLists.txt
tests/server/CMakeLists.txt

index 05f83af868264b151cea048e26aa55b461bb846e..167b55c969cd3d53e9274fb5488be38f5205dae0 100644 (file)
@@ -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)
index 26138a3c9e8a45acfb5d736cddfb806a7648a492..45a533acaac5f6d3896ea2de92e02f8b5f510255 100644 (file)
@@ -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)
index d95a6483038372756863cb39d2204474427d449a..c0be8a96c28f4331e93586b1409c122b12d92f67 100644 (file)
@@ -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