feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CMakePM: Fix conan default profile auto-detection

Browse Source 
CONAN_COMMAND was not available for `conan_profile_detect_default`
function.

Change-Id: I03df06aa88e6588101bb5ec54b3ce2cb64dee2c8
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Cristian Adam
2023-10-17 15:40:40 +02:00
parent fdeff13ca3
commit 879692381f
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/share/3rdparty/package-manager/auto-setup.cmake vendored
View File

@@ -102,11 +102,11 @@ macro(qtc_auto_setup_conan)
project(conan-setup) project(conan-setup)
if (${conan_version} VERSION_GREATER_EQUAL 2.0) if (${conan_version} VERSION_GREATER_EQUAL 2.0)
set(CONAN_COMMAND \"${conan_program}\")
include(\"${CMAKE_CURRENT_LIST_DIR}/conan_provider.cmake\") include(\"${CMAKE_CURRENT_LIST_DIR}/conan_provider.cmake\")
conan_profile_detect_default() conan_profile_detect_default()
detect_host_profile(\"${CMAKE_BINARY_DIR}/conan-dependencies/conan_host_profile\") detect_host_profile(\"${CMAKE_BINARY_DIR}/conan-dependencies/conan_host_profile\")
set(CONAN_COMMAND \"${conan_program}\")
conan_install( conan_install(
-pr \"${CMAKE_BINARY_DIR}/conan-dependencies/conan_host_profile\" -pr \"${CMAKE_BINARY_DIR}/conan-dependencies/conan_host_profile\"
--build=${QT_CREATOR_CONAN_BUILD_POLICY} --build=${QT_CREATOR_CONAN_BUILD_POLICY}