diff options
Diffstat (limited to 'src/gui/.prev_CMakeLists.txt')
| -rw-r--r-- | src/gui/.prev_CMakeLists.txt | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/src/gui/.prev_CMakeLists.txt b/src/gui/.prev_CMakeLists.txt index 885be85a41..8d1ea159f0 100644 --- a/src/gui/.prev_CMakeLists.txt +++ b/src/gui/.prev_CMakeLists.txt @@ -215,7 +215,6 @@ qt_add_module(Gui ../3rdparty/VulkanMemoryAllocator LIBRARIES Qt::CorePrivate - ZLIB::ZLIB PUBLIC_LIBRARIES Qt::Core PRIVATE_MODULE_INTERFACE @@ -397,7 +396,7 @@ qt_extend_target(Gui CONDITION QT_FEATURE_png SOURCES image/qpnghandler.cpp image/qpnghandler_p.h LIBRARIES - PNG::PNG + WrapPNG::WrapPNG ) #### Keys ignored in scope 38:.:image:image/image.pri:WIN32 AND mingw: @@ -538,6 +537,21 @@ qt_extend_target(Gui CONDITION ANDROID AND TEST_architecture_arch STREQUAL x86_6 QT_COMPILER_SUPPORTS_SSE4_2 ) +qt_extend_target(Gui CONDITION QT_FEATURE_system_zlib + LIBRARIES + ZLIB::ZLIB +) + +qt_extend_target(Gui CONDITION NOT QT_FEATURE_system_zlib + INCLUDE_DIRECTORIES + ../3rdparty/zlib/src +) + +qt_extend_target(Gui CONDITION NOT QT_FEATURE_system_zlib AND NOT no_core_dep + LIBRARIES + Qt::Core +) + qt_extend_target(Gui CONDITION QT_FEATURE_regularexpression SOURCES util/qshadergenerator.cpp util/qshadergenerator_p.h |