diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2019-08-13 15:43:26 +0300 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2019-08-13 20:25:22 +0300 |
| commit | 7e91d6dbd38dce4fcab9616dbf30ddc806723a8c (patch) | |
| tree | 25035815bb408a44ffc24f6e0df4dbe9d3bcaafe | |
| parent | 92021cd04e8d217f9d523c091fbcdeb6d55282a8 (diff) | |
Add workaround for broken libxslt include path in Conan package
Addition of include/libxslt to include path causes conflict of header
file names.
Change-Id: Ia08553511cfb017bc32933fa7c296760a410d080
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
| -rw-r--r-- | Source/cmake/OptionsQt.cmake | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Source/cmake/OptionsQt.cmake b/Source/cmake/OptionsQt.cmake index 35bbc70cc..31f89ea82 100644 --- a/Source/cmake/OptionsQt.cmake +++ b/Source/cmake/OptionsQt.cmake @@ -14,6 +14,12 @@ set(PROJECT_VERSION_STRING "${PROJECT_VERSION}") set(QT_CONAN_DIR "" CACHE PATH "Directory containing conanbuildinfo.cmake and conanfile.txt") if (QT_CONAN_DIR) 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}) |