diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2019-08-07 14:23:50 +0300 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2019-08-13 20:25:01 +0300 |
| commit | 92021cd04e8d217f9d523c091fbcdeb6d55282a8 (patch) | |
| tree | cf80abf97e1a5c6bbb0378b9cf13895831035bcf | |
| parent | 688ec88511dedc1de04b4438c26ef071c55de4e8 (diff) | |
Do not allow Conan to modify CMAKE_MODULE_PATH
Change-Id: I750002d7e5f26e424f425e3de318ee3231dc654f
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
| -rw-r--r-- | Source/cmake/OptionsQt.cmake | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/cmake/OptionsQt.cmake b/Source/cmake/OptionsQt.cmake index 2756a928c..35bbc70cc 100644 --- a/Source/cmake/OptionsQt.cmake +++ b/Source/cmake/OptionsQt.cmake @@ -14,7 +14,10 @@ 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") + set(_BACKUP_CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}) conan_basic_setup() + set(CMAKE_MODULE_PATH ${_BACKUP_CMAKE_MODULE_PATH}) + unset(_BACKUP_CMAKE_MODULE_PATH) install(CODE " set(_conan_imports_dest \${CMAKE_INSTALL_PREFIX}) |