diff options
| author | Brad King <brad.king@kitware.com> | 2014-03-11 13:13:58 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-03-11 13:13:58 (GMT) |
| commit | 510ceb19edf930899521dbbb825f315f46b6e989 (patch) | |
| tree | be3989b5d5118aad13b6bd11723dab6d9f76f68d /Source/cmQtAutoGenerators.cxx | |
| parent | c9241cad83318f39a1ccefd03e72a8a958c1bbbc (diff) | |
| parent | 112cba927abfd54e72d12831dc668148c1465446 (diff) | |
| download | CMake-510ceb19edf930899521dbbb825f315f46b6e989.zip CMake-510ceb19edf930899521dbbb825f315f46b6e989.tar.gz CMake-510ceb19edf930899521dbbb825f315f46b6e989.tar.bz2 | |
Merge topic 'fix-AUTOGEN-custom-command-depends'
112cba92 QtAutogen: Fix AUTOGEN depends on custom command output with VS.
Diffstat (limited to 'Source/cmQtAutoGenerators.cxx')
| -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 c32f624..37b0f33 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) { |