Skip to content

Commit 0b74e07

Browse files
committed
test: fix optional test deps not linking in superproject builds
1 parent f420e65 commit 0b74e07

3 files changed

Lines changed: 7 additions & 17 deletions

File tree

CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -161,10 +161,6 @@ function(boost_burl_setup_properties target)
161161
target_include_directories(${target} PUBLIC "${PROJECT_SOURCE_DIR}/include")
162162
target_include_directories(${target} PRIVATE "${PROJECT_SOURCE_DIR}")
163163
target_link_libraries(${target} PUBLIC ${BOOST_BURL_DEPENDENCIES})
164-
# Link corosio_openssl for TLS support when available.
165-
# In superproject builds, corosio is processed after burl (alphabetically),
166-
# so the target may not exist at configure time. Use $<TARGET_NAME_IF_EXISTS:...>
167-
# which evaluates at generation time when all targets exist.
168164
target_link_libraries(${target} PUBLIC $<TARGET_NAME_IF_EXISTS:Boost::corosio_openssl>)
169165
target_compile_definitions(${target} PUBLIC BOOST_BURL_NO_LIB)
170166
target_compile_definitions(${target} PRIVATE BOOST_BURL_SOURCE)

test/unit/CMakeLists.txt

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,11 @@ list(APPEND PFILES
1919
source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} PREFIX "" FILES ${PFILES})
2020

2121
add_executable(boost_burl_tests ${PFILES})
22-
target_link_libraries(
23-
boost_burl_tests PRIVATE
22+
target_link_libraries(boost_burl_tests PRIVATE
2423
boost_capy_test_suite_main
25-
Boost::burl)
26-
27-
if (TARGET Boost::http_zlib)
28-
target_link_libraries(boost_burl_tests PRIVATE Boost::http_zlib)
29-
endif()
30-
31-
if (TARGET Boost::http_brotli)
32-
target_link_libraries(boost_burl_tests PRIVATE Boost::http_brotli)
33-
endif()
24+
Boost::burl
25+
$<TARGET_NAME_IF_EXISTS:Boost::http_zlib>
26+
$<TARGET_NAME_IF_EXISTS:Boost::http_brotli>)
3427

3528
target_include_directories(boost_burl_tests PRIVATE . ../../)
3629

test/unit/client.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -719,7 +719,8 @@ class client_test
719719
capy::test::run_blocking()([&]() -> capy::task<>
720720
{
721721
auto cfg = net.config();
722-
cfg.gzip = true;
722+
cfg.gzip = true;
723+
cfg.deflate = true;
723724
client c(
724725
co_await capy::this_coro::executor,
725726
corosio::tls_context(),
@@ -736,7 +737,7 @@ class client_test
736737
}());
737738

738739
BOOST_TEST(
739-
net.written(0).find("Accept-Encoding: gzip\r\n") !=
740+
net.written(0).find("Accept-Encoding: deflate, gzip\r\n") !=
740741
std::string::npos);
741742
}
742743

0 commit comments

Comments
 (0)