diff options
| author | Brad King <brad.king@kitware.com> | 2014-03-10 13:38:52 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-03-10 13:38:52 (GMT) |
| commit | ebaa5a641026d01e58debedb92bd23322513e48c (patch) | |
| tree | 2be55ce27f37048d98b8bdaa211a8fa8dc684bf3 /Source | |
| parent | 29ff93a9706ed5c6942f821085ace37fbdebba14 (diff) | |
| parent | 112cba927abfd54e72d12831dc668148c1465446 (diff) | |
| download | CMake-ebaa5a641026d01e58debedb92bd23322513e48c.zip CMake-ebaa5a641026d01e58debedb92bd23322513e48c.tar.gz CMake-ebaa5a641026d01e58debedb92bd23322513e48c.tar.bz2 | |
Merge branch 'fix-AUTOGEN-custom-command-depends' into release
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmQtAutoGenerators.cxx | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx index dfb310e..2c5dd45 100644 --- a/Source/cmQtAutoGenerators.cxx +++ b/Source/cmQtAutoGenerators.cxx @@ -260,6 +260,18 @@ bool cmQtAutoGenerators::InitializeAutogenTarget(cmTarget* target) // This also works around a VS 11 bug that may skip updating the target: // https://connect.microsoft.com/VisualStudio/feedback/details/769495 usePRE_BUILD = vslg->GetVersion() >= cmLocalVisualStudioGenerator::VS7; + if(usePRE_BUILD) + { + for (std::vector<std::string>::iterator it = depends.begin(); + it != depends.end(); ++it) + { + if(!makefile->FindTargetToUse(it->c_str())) + { + usePRE_BUILD = false; + break; + } + } + } } if(usePRE_BUILD) { |