diff options
| author | Sebastian Holtermann <sebholt@xwmw.org> | 2018-11-27 09:50:49 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-11-27 13:21:40 (GMT) |
| commit | b1b5004c1a00b123170724dd3a2d8c024f72684a (patch) | |
| tree | 0d86f53f029a1e94ffe5f33b5dab50bc3243a583 /Source/cmQtAutoGenInitializer.cxx | |
| parent | 05a2ca7f87b9ae73f373e9967fde1ee5210e33af (diff) | |
| download | CMake-b1b5004c1a00b123170724dd3a2d8c024f72684a.zip CMake-b1b5004c1a00b123170724dd3a2d8c024f72684a.tar.gz CMake-b1b5004c1a00b123170724dd3a2d8c024f72684a.tar.bz2 | |
Autogen: Fix empty uic executable string
In CMake 3.13.0 when a target has ``AUTOUIC`` enabled but doesn't
link against Qt5Widgets, the uic executable string is empty and
an error string "The uic executable \"\" does not exist" is generated.
In CMake 3.12 ``AUTOUIC`` was silently disabled instead.
This patch fixes the regression and restores the behavior of CMake 3.12.
Fixes: #18630
Diffstat (limited to 'Source/cmQtAutoGenInitializer.cxx')
| -rw-r--r-- | Source/cmQtAutoGenInitializer.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmQtAutoGenInitializer.cxx b/Source/cmQtAutoGenInitializer.cxx index 8a202a2..ba7a565 100644 --- a/Source/cmQtAutoGenInitializer.cxx +++ b/Source/cmQtAutoGenInitializer.cxx @@ -1409,7 +1409,7 @@ bool cmQtAutoGenInitializer::GetUicExecutable() } // Test uic command - if (err.empty()) { + if (err.empty() && !this->Uic.Executable.empty()) { if (cmSystemTools::FileExists(this->Uic.Executable, true)) { std::vector<std::string> command; command.push_back(this->Uic.Executable); |