diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2020-02-04 12:21:38 +0300 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2020-02-24 13:02:14 +0300 |
| commit | 81909ca7f5e098682522d98d3c22018fa9bf76c1 (patch) | |
| tree | 0f107f355cdd56708718ded449692881e2f929ef /Source | |
| parent | 1ee41e6e22d4ff19029e0ae28c083a8c68f02baf (diff) | |
Import QtWebKit commit 148b29f49161dd4ebba296cf675bf0afa4b73bc4
Change-Id: I1ce086a99e5f254e40ac174de1120c5545ab04e3
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmake/OptionsQt.cmake | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/Source/cmake/OptionsQt.cmake b/Source/cmake/OptionsQt.cmake index ec6081de0..83ff1ceb6 100644 --- a/Source/cmake/OptionsQt.cmake +++ b/Source/cmake/OptionsQt.cmake @@ -18,25 +18,7 @@ if (QT_CONAN_DIR) message(FATAL_ERROR "conan executable not found. Make sure that Conan is installed and available in PATH") endif () include("${QT_CONAN_DIR}/conanbuildinfo.cmake") - - # Remove this workaround when libxslt package is fixed - string(REPLACE "include/libxslt" "include" replace_CONAN_INCLUDE_DIRS "${CONAN_INCLUDE_DIRS}") - set(CONAN_INCLUDE_DIRS ${replace_CONAN_INCLUDE_DIRS}) - - # Remove this workaround when libxml2 package is fixed - set(_BACKUP_CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}) - conan_basic_setup() - 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 () + conan_basic_setup(TARGETS) install(CODE " set(_conan_imports_dest \${CMAKE_INSTALL_PREFIX}) |