From 3403d64c98fdeb6345d794ec0821929bf7cf1ec0 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Wed, 18 Sep 2019 05:06:25 +0300 Subject: Import QtWebKit commit b9c5fd65c91fb38ac81276e470093dd6683a4ade Change-Id: I4d323f3577d6e897cee5f08b4811bbe1f7553e8d Reviewed-by: Konstantin Tokarev --- Source/cmake/OptionsQt.cmake | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Source/cmake/OptionsQt.cmake b/Source/cmake/OptionsQt.cmake index bdcc58a48..f980569bc 100644 --- a/Source/cmake/OptionsQt.cmake +++ b/Source/cmake/OptionsQt.cmake @@ -29,6 +29,15 @@ if (QT_CONAN_DIR) set(CMAKE_MODULE_PATH ${_BACKUP_CMAKE_MODULE_PATH}) unset(_BACKUP_CMAKE_MODULE_PATH) + # Because we've reset CMAKE_MODULE_PATH, FindZLIB from Conan is not used, which causes error with MinGW + if (NOT QT_BUNDLED_ZLIB) + if (NOT CONAN_ZLIB_ROOT) + message(FATAL_ERROR "CONAN_ZLIB_ROOT is not set") + endif () + set(ZLIB_ROOT ${CONAN_ZLIB_ROOT}) + message(STATUS "ZLIB_ROOT: ${ZLIB_ROOT}") + endif () + install(CODE " set(_conan_imports_dest \${CMAKE_INSTALL_PREFIX}) if (DEFINED ENV{DESTDIR}) -- cgit v1.2.1