From ab55fb2446ce8c780b2cd2c6d4860a104eaacc99 Mon Sep 17 00:00:00 2001 From: Cristian Adam Date: Thu, 27 May 2021 18:40:33 +0200 Subject: 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 --- src/share/3rdparty/package-manager/auto-setup.cmake | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src') 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 -- cgit v1.2.3