dilim/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-08-09 09:12:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmake-gui: fix receiving directory path from file dialogs

Browse Source 
System file dialogs might return directory path with trailing slash,
which is a problem for source path, because then the ${sourceDirName} in
presets evaluates to empty string. Resolve that by stripping the
trailing slashes from source and binary dirs.
This commit is contained in:
Eugene Shalygin
2026-07-09 16:38:03 +02:00
parent c9d0311a2b
commit 8073e676bd
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Source/QtDialog/QCMake.cxx
View File

@@ -25,6 +25,16 @@
# include "qt_windows.h" // For SetErrorMode
#endif
static QString sanitizedDirPath(QString const& dir)
{
QString result = QString::fromStdString(
cmSystemTools::GetActualCaseForPath(dir.toStdString()));
if (result.size() > 1 && result.endsWith(QDir::separator())) {
result = result.left(result.size() - 1);
}
return result;
}
QCMake::QCMake(QObject* p)
: QObject(p)
, StartEnvironment(QProcessEnvironment::systemEnvironment())
@@ -75,8 +85,7 @@ void QCMake::loadCache(QString const& dir)
void QCMake::setSourceDirectory(QString const& _dir)
{
QString dir = QString::fromStdString(
cmSystemTools::GetActualCaseForPath(_dir.toStdString()));
QString dir = sanitizedDirPath(_dir);
if (this->SourceDirectory != dir) {
this->SourceDirectory = QDir::fromNativeSeparators(dir);
emit this->sourceDirChanged(this->SourceDirectory);
@@ -92,8 +101,7 @@ void QCMake::setSourceDirectory(QString const& _dir)
void QCMake::setBinaryDirectory(QString const& _dir)
{
QString dir = QString::fromStdString(
cmSystemTools::GetActualCaseForPath(_dir.toStdString()));
QString dir = sanitizedDirPath(_dir);
QString absDir = dir;