diff options
| author | Cristian Adam <cristian.adam@qt.io> | 2021-05-27 18:40:33 +0200 |
|---|---|---|
| committer | Cristian Adam <cristian.adam@qt.io> | 2021-05-28 11:53:46 +0000 |
| commit | ab55fb2446ce8c780b2cd2c6d4860a104eaacc99 (patch) | |
| tree | 72b0718c33eef373a8ab4b62d4af76efb06bee9d /src/share | |
| parent | 95ff7a6c80c6f9e7edef1710771d40ba399842bf (diff) | |
CMakePM: Fix conan compiler path setup
The conan toolchain.file was not passed to the cmake process that
was setting up conan install, only inside for conan.
Task-number: QTCREATORBUG-21785
Change-Id: I5f315e7de823d4ef3237081da9b294b236fedebb
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Diffstat (limited to 'src/share')
| -rw-r--r-- | src/share/3rdparty/package-manager/auto-setup.cmake | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/share/3rdparty/package-manager/auto-setup.cmake b/src/share/3rdparty/package-manager/auto-setup.cmake index 56da6eb3dd..e342c32e5f 100644 --- a/src/share/3rdparty/package-manager/auto-setup.cmake +++ b/src/share/3rdparty/package-manager/auto-setup.cmake @@ -79,6 +79,8 @@ if (conanfile_txt AND NOT QT_CREATOR_SKIP_CONAN_SETUP) execute_process(COMMAND ${CMAKE_COMMAND} -S "${CMAKE_BINARY_DIR}/conan-dependencies/" -B "${CMAKE_BINARY_DIR}/conan-dependencies/build" + -C "${CMAKE_BINARY_DIR}/qtcsettings.cmake" + -D "CMAKE_TOOLCHAIN_FILE=${CMAKE_BINARY_DIR}/conan-dependencies/toolchain.cmake" -G ${CMAKE_GENERATOR} -D CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} RESULT_VARIABLE result |