diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2019-09-06 03:30:08 +0300 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2019-09-06 03:33:03 +0300 |
| commit | 8b813e69d7764a1ad320de203fbcf17146ba469b (patch) | |
| tree | ee7f6922327632b276f89d5e1e07da9ed7b01d0c | |
| parent | 34c2a6ebc0d579f08c18ce4e895fd3a9fadf7370 (diff) | |
| download | qtwebkit-8b813e69d7764a1ad320de203fbcf17146ba469b.tar.gz | |
[cmake] Make sure that conan executable is available
If conan is missing in PATH, try using PIP3_PATH as a fallback,
otherwise abort build.
Change-Id: I12b8a44da677ccef1abf6e68f3b0a3f1dd99b28c
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
| -rw-r--r-- | Source/cmake/OptionsQt.cmake | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/cmake/OptionsQt.cmake b/Source/cmake/OptionsQt.cmake index 0eef49095..7e1e55340 100644 --- a/Source/cmake/OptionsQt.cmake +++ b/Source/cmake/OptionsQt.cmake @@ -13,6 +13,10 @@ set(PROJECT_VERSION_STRING "${PROJECT_VERSION}") set(QT_CONAN_DIR "" CACHE PATH "Directory containing conanbuildinfo.cmake and conanfile.txt") if (QT_CONAN_DIR) + find_program(CONAN_COMMAND NAMES conan PATHS $ENV{PIP3_PATH}) + if (NOT CONAN_COMMAND) + 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 @@ -35,7 +39,7 @@ if (QT_CONAN_DIR) message(\"Importing dependencies from conan to \${_conan_imports_dest}\") execute_process( - COMMAND conan imports --import-folder \${_conan_imports_dest} \"${QT_CONAN_DIR}/conanfile.txt\" + COMMAND \"${CONAN_COMMAND}\" imports --import-folder \${_conan_imports_dest} \"${QT_CONAN_DIR}/conanfile.txt\" WORKING_DIRECTORY \"${QT_CONAN_DIR}\" RESULT_VARIABLE _conan_imports_result ) |