diff options
Diffstat (limited to 'src/plugins/conan/conaninstallstep.cpp')
| -rw-r--r-- | src/plugins/conan/conaninstallstep.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/conan/conaninstallstep.cpp b/src/plugins/conan/conaninstallstep.cpp index 9f3e22575b..8d7a4adf31 100644 --- a/src/plugins/conan/conaninstallstep.cpp +++ b/src/plugins/conan/conaninstallstep.cpp @@ -23,6 +23,7 @@ ** ****************************************************************************/ +#include "conanconstants.h" #include "conaninstallstep.h" #include "conanplugin.h" #include "conansettings.h" @@ -67,7 +68,8 @@ ConanInstallStep::ConanInstallStep(BuildStepList *bsl, Id id) auto conanFile = addAspect<StringAspect>(); conanFile->setSettingsKey("ConanPackageManager.InstallStep.ConanFile"); - conanFile->setFilePath(project()->projectDirectory() / "conanfile.txt"); + conanFile->setFilePath(ConanPlugin::conanFilePath(project(), + project()->projectDirectory() / "conanfile.txt")); conanFile->setLabelText(tr("Conan file:")); conanFile->setToolTip(tr("Enter location of conanfile.txt or conanfile.py.")); conanFile->setDisplayStyle(StringAspect::PathChooserDisplay); @@ -134,7 +136,7 @@ void ConanInstallStep::setupOutputFormatter(OutputFormatter *formatter) ConanInstallStepFactory::ConanInstallStepFactory() { - registerStep<ConanInstallStep>("ConanPackageManager.InstallStep"); + registerStep<ConanInstallStep>(Constants::INSTALL_STEP); setDisplayName(ConanInstallStep::tr("Run conan install")); } |