build: sync build scripts between client/libtest

Closes #17660

diff --git a/tests/client/CMakeLists.txt b/tests/client/CMakeLists.txt
index 2521a28970a669c7e02ea66abe5304a8620f5e05..227dce769bf639cd335f0db3338340d37e2af333 100644 (file)
--- a/tests/client/CMakeLists.txt
+++ b/tests/client/CMakeLists.txt
@@ -22,7 +22,7 @@
 #
 ###########################################################################
 
-# Get BUNDLE, BUNDLE_SRC, CURLX_SRCS, FIRSTFILES, TESTFILES variables
+# Get BUNDLE, BUNDLE_SRC, FIRSTFILES, CURLX_SRCS, TESTFILES variables
 curl_transform_makefile_inc("Makefile.inc" "${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc.cmake")
 include("${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc.cmake")
 

diff --git a/tests/client/Makefile.am b/tests/client/Makefile.am
index a8427e32bc44c9f8f731797e7c9bad315505123b..b9d2e5e141c19343715e5f424e2cd731e15d679c 100644 (file)
--- a/tests/client/Makefile.am
+++ b/tests/client/Makefile.am
@@ -38,7 +38,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include        \
               -I$(top_srcdir)/lib/curlx      \
               -I$(srcdir)
 
-# Get BUNDLE, BUNDLE_SRC, CURLX_SRCS, FIRSTFILES, TESTFILES variables
+# Get BUNDLE, BUNDLE_SRC, FIRSTFILES, CURLX_SRCS, TESTFILES variables
 include Makefile.inc
 
 EXTRA_DIST = CMakeLists.txt $(FIRSTFILES) $(TESTFILES)

diff --git a/tests/libtest/CMakeLists.txt b/tests/libtest/CMakeLists.txt
index dd1df40dc5291e0a2c6e7ca245eb6e2588e4c36e..2bd484b401cdc5dea25538fcaa6882093ac8354d 100644 (file)
--- a/tests/libtest/CMakeLists.txt
+++ b/tests/libtest/CMakeLists.txt
@@ -49,7 +49,6 @@ add_custom_command(OUTPUT "${BUNDLE_SRC}"
 
 add_executable(libtests EXCLUDE_FROM_ALL "${BUNDLE_SRC}")
 add_dependencies(testdeps libtests)
-target_link_libraries(libtests ${LIB_SELECTED} ${CURL_LIBS})
 target_include_directories(libtests PRIVATE
   "${PROJECT_BINARY_DIR}/lib"            # for "curl_config.h"
   "${PROJECT_SOURCE_DIR}/lib"            # for "curl_setup.h"
@@ -58,5 +57,6 @@ target_include_directories(libtests PRIVATE
   "${PROJECT_SOURCE_DIR}/tests/libtest"  # to be able to build generated tests
   "${PROJECT_SOURCE_DIR}/tests/unit"     # for curlcheck.h
 )
+target_link_libraries(libtests ${LIB_SELECTED} ${CURL_LIBS})
 set_property(TARGET libtests APPEND PROPERTY COMPILE_DEFINITIONS "${CURL_DEBUG_MACROS}" "CURL_NO_OLDIES" "CURL_DISABLE_DEPRECATION")
 set_target_properties(libtests PROPERTIES OUTPUT_NAME "${BUNDLE}" PROJECT_LABEL "Test ${BUNDLE}" UNITY_BUILD OFF)