diff options
| author | Brad King <brad.king@kitware.com> | 2013-10-15 13:32:32 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-10-15 13:32:32 (GMT) |
| commit | ebffbda4476aae1e89029f2e24fd76a22765205a (patch) | |
| tree | b03c5806968dd58a35635de71af9ab2323688b75 /Source/cmIncludeCommand.cxx | |
| parent | 29b1e591152dc56c03ae2b6d6721d5b1c297505a (diff) | |
| parent | af1f6987571b6f8298b03e184aa4aad23882d5c8 (diff) | |
| download | CMake-ebffbda4476aae1e89029f2e24fd76a22765205a.zip CMake-ebffbda4476aae1e89029f2e24fd76a22765205a.tar.gz CMake-ebffbda4476aae1e89029f2e24fd76a22765205a.tar.bz2 | |
Merge topic 'fix-CMP0024-multiple-directories'
af1f698 CMP0024: Store the fact of included export in global generator.
Diffstat (limited to 'Source/cmIncludeCommand.cxx')
| -rw-r--r-- | Source/cmIncludeCommand.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/cmIncludeCommand.cxx b/Source/cmIncludeCommand.cxx index a3d8b83..39d4993 100644 --- a/Source/cmIncludeCommand.cxx +++ b/Source/cmIncludeCommand.cxx @@ -93,7 +93,9 @@ bool cmIncludeCommand cmSystemTools::CollapseFullPath(fname.c_str(), this->Makefile->GetStartDirectory()); - if (this->Makefile->IsExportedTargetsFile(fname_abs)) + cmGlobalGenerator *gg = this->Makefile->GetLocalGenerator() + ->GetGlobalGenerator(); + if (gg->IsExportedTargetsFile(fname_abs)) { const char *modal = 0; cmake::MessageType messageType = cmake::AUTHOR_WARNING; |