diff options
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/.prev_CMakeLists.txt | 16 | ||||
| -rw-r--r-- | src/network/CMakeLists.txt | 16 |
2 files changed, 30 insertions, 2 deletions
diff --git a/src/network/.prev_CMakeLists.txt b/src/network/.prev_CMakeLists.txt index afe28a2da0..8f38d07e93 100644 --- a/src/network/.prev_CMakeLists.txt +++ b/src/network/.prev_CMakeLists.txt @@ -50,7 +50,6 @@ qt_add_module(Network kernel LIBRARIES Qt::CorePrivate - ZLIB::ZLIB PUBLIC_LIBRARIES Qt::Core PRIVATE_MODULE_INTERFACE @@ -147,6 +146,21 @@ qt_extend_target(Network CONDITION QT_FEATURE_http socket/qhttpsocketengine.cpp socket/qhttpsocketengine_p.h ) +qt_extend_target(Network CONDITION QT_FEATURE_system_zlib + LIBRARIES + ZLIB::ZLIB +) + +qt_extend_target(Network CONDITION NOT QT_FEATURE_system_zlib + INCLUDE_DIRECTORIES + ../3rdparty/zlib/src +) + +qt_extend_target(Network CONDITION NOT QT_FEATURE_system_zlib AND NOT no_core_dep + LIBRARIES + Qt::Core +) + qt_extend_target(Network CONDITION QT_FEATURE_topleveldomain SOURCES kernel/qtldurl.cpp kernel/qtldurl_p.h diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt index ca30771eb0..c455a00121 100644 --- a/src/network/CMakeLists.txt +++ b/src/network/CMakeLists.txt @@ -63,7 +63,6 @@ qt_add_module(Network kernel LIBRARIES Qt::CorePrivate - ZLIB::ZLIB PUBLIC_LIBRARIES Qt::Core PRIVATE_MODULE_INTERFACE @@ -160,6 +159,21 @@ qt_extend_target(Network CONDITION QT_FEATURE_http socket/qhttpsocketengine.cpp socket/qhttpsocketengine_p.h ) +qt_extend_target(Network CONDITION QT_FEATURE_system_zlib + LIBRARIES + ZLIB::ZLIB +) + +qt_extend_target(Network CONDITION NOT QT_FEATURE_system_zlib + INCLUDE_DIRECTORIES + ../3rdparty/zlib/src +) + +qt_extend_target(Network CONDITION NOT QT_FEATURE_system_zlib AND NOT no_core_dep + LIBRARIES + Qt::Core +) + qt_extend_target(Network CONDITION QT_FEATURE_topleveldomain SOURCES kernel/qtldurl.cpp kernel/qtldurl_p.h |