diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2023-05-26 10:11:11 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2023-05-27 12:57:16 -0700 |
| commit | 26dd7fe4edb8ed39ebf12cae874eb89e46ff9067 (patch) | |
| tree | 9a193b161641f67e66986b483415c6e98662414e /src/network/CMakeLists.txt | |
| parent | 369952fbd7163c9ae2fa6401b8da3a5dc5d2368b (diff) | |
CMake: remove "res_ninit" feature and collapse to just "libresolv"
Testing for "res_ninit" when WrapResolv.cmake has already checked for
far more complex functions was pointless. Instead, just accept the
library that was found by find_package() as good enough and rename the
feature as "libresolv".
Amends 4a46ba1209907796f4a14f6feb35ed4d70155d7d and
68b625901f9eb7c34e3d7aa302e1c0a454d3190b.
Change-Id: Ib5ce7a497e034ebabb2cfffd1762c0afa2fac6e0
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src/network/CMakeLists.txt')
| -rw-r--r-- | src/network/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt index fcd31fe979..64c9bf5942 100644 --- a/src/network/CMakeLists.txt +++ b/src/network/CMakeLists.txt @@ -213,7 +213,7 @@ qt_internal_extend_target(Network CONDITION APPLE ${FWCFNetwork} ) -qt_internal_extend_target(Network CONDITION QT_FEATURE_dnslookup AND TEST_res_ninit +qt_internal_extend_target(Network CONDITION QT_FEATURE_dnslookup AND QT_FEATURE_libresolv SOURCES kernel/qdnslookup_unix.cpp LIBRARIES @@ -225,7 +225,7 @@ qt_internal_extend_target(Network CONDITION QT_FEATURE_dnslookup AND WIN32 kernel/qdnslookup_win.cpp ) -qt_internal_extend_target(Network CONDITION QT_FEATURE_dnslookup AND NOT TEST_res_ninit AND NOT WIN32 +qt_internal_extend_target(Network CONDITION QT_FEATURE_dnslookup AND NOT QT_FEATURE_libresolv AND NOT WIN32 SOURCES kernel/qdnslookup_dummy.cpp ) |