diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2019-09-18 05:06:25 +0300 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2019-09-18 05:08:25 +0300 |
| commit | 3403d64c98fdeb6345d794ec0821929bf7cf1ec0 (patch) | |
| tree | 8333a6ac64fc2201cb66b6420a200fa0d4e54cb6 | |
| parent | 47e125f8c3ff6fb508a8f055d45b15365d5e9d83 (diff) | |
Import QtWebKit commit b9c5fd65c91fb38ac81276e470093dd6683a4ade
Change-Id: I4d323f3577d6e897cee5f08b4811bbe1f7553e8d
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
| -rw-r--r-- | Source/cmake/OptionsQt.cmake | 9 |
1 files changed, 9 insertions, 0 deletions
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}) |