diff options
| author | Brad King <brad.king@kitware.com> | 2021-04-07 12:44:57 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-04-07 12:45:06 (GMT) |
| commit | b962b9cf1dd18ed5a4df7cdd2becac631d051fc4 (patch) | |
| tree | e0b8abca006681c284f4763f79bedfa518c4f8a6 /Source | |
| parent | a8b6b54239ac39493947e97cbe5164ac2b1c323e (diff) | |
| parent | e8ddc1e268d2db78a2f3edde1f6edb05d9243ada (diff) | |
| download | CMake-b962b9cf1dd18ed5a4df7cdd2becac631d051fc4.zip CMake-b962b9cf1dd18ed5a4df7cdd2becac631d051fc4.tar.gz CMake-b962b9cf1dd18ed5a4df7cdd2becac631d051fc4.tar.bz2 | |
Merge topic 'autouic-source-group-fixes'
e8ddc1e268 Autogen: Fix a bug in setting the UIC source group
7f0151dc91 Help: Document the AUTOUIC_SOURCE_GROUP property
f6c47dd0b4 Help: Fix a typo in the AUTOGEN_SOURCE_GROUP help
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Alexey Edelev <alexey.edelev@qt.io>
Merge-request: !5978
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmQtAutoGenInitializer.cxx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Source/cmQtAutoGenInitializer.cxx b/Source/cmQtAutoGenInitializer.cxx index 6528687..e96ec63 100644 --- a/Source/cmQtAutoGenInitializer.cxx +++ b/Source/cmQtAutoGenInitializer.cxx @@ -943,8 +943,14 @@ bool cmQtAutoGenInitializer::InitScanFiles() this->LocalGen->GetCurrentSourceDirectory(), cmSystemTools::GetFilenamePath(fullPath)); + // Avoid creating a path containing adjacent slashes + if (!uiHeaderRelativePath.empty() && + uiHeaderRelativePath.back() != '/') { + uiHeaderRelativePath += '/'; + } + auto uiHeaderFilePath = cmStrCat( - '/', uiHeaderRelativePath, '/', "ui_"_s, + '/', uiHeaderRelativePath, "ui_"_s, cmSystemTools::GetFilenameWithoutLastExtension(fullPath), ".h"_s); ConfigString uiHeader; |