diff options
| author | Brad King <brad.king@kitware.com> | 2018-11-28 11:42:48 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-11-28 11:42:58 (GMT) |
| commit | 6bfcd4db3b4fbbdeda2e8736b0b88204e68b192e (patch) | |
| tree | 18df309fddde9de916960dfa7b0ef9a35a891560 | |
| parent | faf4496db372847f34046acfd0d57dda7812eafa (diff) | |
| parent | b1b5004c1a00b123170724dd3a2d8c024f72684a (diff) | |
| download | CMake-6bfcd4db3b4fbbdeda2e8736b0b88204e68b192e.zip CMake-6bfcd4db3b4fbbdeda2e8736b0b88204e68b192e.tar.gz CMake-6bfcd4db3b4fbbdeda2e8736b0b88204e68b192e.tar.bz2 | |
Merge topic 'autogen_uic_empty_fix_3_13'
b1b5004c1a Autogen: Fix empty uic executable string
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2667
| -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 e71feac..582faf6 100644 --- a/Source/cmQtAutoGenInitializer.cxx +++ b/Source/cmQtAutoGenInitializer.cxx @@ -1485,7 +1485,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); |