From a4a13c96ca43bf262d2460d013c5cb05724fb09c Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 18 Jun 2025 10:26:42 +0200 Subject: [PATCH] build: sync build scripts between client/libtest Closes #17660 --- tests/client/CMakeLists.txt | 2 +- tests/client/Makefile.am | 2 +- tests/libtest/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/client/CMakeLists.txt b/tests/client/CMakeLists.txt index 2521a28970..227dce769b 100644 --- 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 a8427e32bc..b9d2e5e141 100644 --- 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 dd1df40dc5..2bd484b401 100644 --- 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) -- 2.47.2