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

CMake: Be a bit more specific on what is not reachable

Browse Source 
Change-Id: I5d521a9562d36850c264e1af48b46e16c642fde9
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
This commit is contained in:
hjk
2022-09-30 17:06:53 +02:00
parent 5ab100a2b9
commit efbab2e7c4
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/cmakeprojectmanager/cmakeprocess.cpp
View File

@@ -55,10 +55,19 @@ void CMakeProcess::run(const BuildDirParameters &parameters, const QStringList &
const FilePath cmakeExecutable = cmake->cmakeExecutable(); const FilePath cmakeExecutable = cmake->cmakeExecutable();
if (!cmakeExecutable.ensureReachable(parameters.sourceDirectory) if (!cmakeExecutable.ensureReachable(parameters.sourceDirectory)) {
|| !cmakeExecutable.ensureReachable(parameters.buildDirectory)) {
QString msg = ::CMakeProjectManager::Tr::tr( QString msg = ::CMakeProjectManager::Tr::tr(
"The source or build directory is not reachable by the CMake executable."); "The source directory %1 is not reachable by the CMake executable %2.")
.arg(parameters.sourceDirectory.displayName()).arg(cmakeExecutable.displayName());
BuildSystem::appendBuildSystemOutput(msg + '\n');
emit finished();
return;
}
if (!cmakeExecutable.ensureReachable(parameters.buildDirectory)) {
QString msg = ::CMakeProjectManager::Tr::tr(
"The build directory %1 is not reachable by the CMake executable %2.")
.arg(parameters.buildDirectory.displayName()).arg(cmakeExecutable.displayName());
BuildSystem::appendBuildSystemOutput(msg + '\n'); BuildSystem::appendBuildSystemOutput(msg + '\n');
emit finished(); emit finished();
return; return;