diff options
| author | Brad King <brad.king@kitware.com> | 2018-11-27 13:45:58 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-11-27 13:45:58 (GMT) |
| commit | 0f0c8a2c7d13e0b2b1b4ec18fea00071682b2c7c (patch) | |
| tree | 30ea36a88c50c71efffb35feb5311036d0973d8e /Source | |
| parent | 2cf836fa5ee71417145ec93e8f962d08c4a7d565 (diff) | |
| parent | b1b5004c1a00b123170724dd3a2d8c024f72684a (diff) | |
| download | CMake-0f0c8a2c7d13e0b2b1b4ec18fea00071682b2c7c.zip CMake-0f0c8a2c7d13e0b2b1b4ec18fea00071682b2c7c.tar.gz CMake-0f0c8a2c7d13e0b2b1b4ec18fea00071682b2c7c.tar.bz2 | |
Merge branch 'autogen_uic_empty_fix_3_13' into release-3.13
Merge-request: !2667
Diffstat (limited to 'Source')
| -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); |