diff options
| author | Cristian Adam <cristian.adam@qt.io> | 2021-04-14 14:02:23 +0200 |
|---|---|---|
| committer | Cristian Adam <cristian.adam@qt.io> | 2021-04-22 10:44:50 +0000 |
| commit | 169614d8b150afff2d0dce82ed03f168aa6bc23c (patch) | |
| tree | 48d724a62db934f062b8602b07eb5cf84f6b9507 /src/share | |
| parent | ebc033130655ffa5ee46d0b156d38f671458da45 (diff) | |
CMakePM: Setup conan path from Qt SDK
Read and prepend the conan path from Qt SDK which is set in
QtCreator.ini.
Fixes: QTCREATORBUG-25553
Change-Id: I1404064ca253cb968d19bca253f1bb781209d0bd
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Diffstat (limited to 'src/share')
| -rw-r--r-- | src/share/3rdparty/package-manager/auto-setup.cmake | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/src/share/3rdparty/package-manager/auto-setup.cmake b/src/share/3rdparty/package-manager/auto-setup.cmake index 29ab01b5a5..56da6eb3dd 100644 --- a/src/share/3rdparty/package-manager/auto-setup.cmake +++ b/src/share/3rdparty/package-manager/auto-setup.cmake @@ -19,6 +19,30 @@ endforeach() if (conanfile_txt AND NOT QT_CREATOR_SKIP_CONAN_SETUP) + # Get conan from Qt SDK + set(qt_creator_ini "${CMAKE_CURRENT_LIST_DIR}/../QtProject/QtCreator.ini") + file(STRINGS ${qt_creator_ini} install_settings REGEX "^InstallSettings=.*$") + if (install_settings) + string(REPLACE "InstallSettings=" "" install_settings "${install_settings}") + set(qt_creator_ini "${install_settings}/QtProject/QtCreator.ini") + file(TO_CMAKE_PATH "${qt_creator_ini}" qt_creator_ini) + endif() + + file(STRINGS ${qt_creator_ini} conan_executable REGEX "^ConanFilePath=.*$") + if (conan_executable) + string(REPLACE "ConanFilePath=" "" conan_executable "${conan_executable}") + file(TO_CMAKE_PATH "${conan_executable}" conan_executable) + get_filename_component(conan_path "${conan_executable}" DIRECTORY) + endif() + + set(path_sepparator ":") + if (WIN32) + set(path_sepparator ";") + endif() + if (conan_path) + set(ENV{PATH} "${conan_path}${path_sepparator}$ENV{PATH}") + endif() + set(conanfile_timestamp_file "${CMAKE_BINARY_DIR}/conan-dependencies/conanfile.timestamp") file(TIMESTAMP "${conanfile_txt}" conanfile_timestamp) |