diff options
| author | Stephen Kelly <steveire@gmail.com> | 2013-10-10 09:46:06 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2013-10-10 10:01:39 (GMT) |
| commit | af1f6987571b6f8298b03e184aa4aad23882d5c8 (patch) | |
| tree | b8c2ed5d64659f6defc853921a1aa5cf2b46e8dd /Source/cmIncludeCommand.cxx | |
| parent | 7e4910fe47d667e059e42ac6395b0f4726f17064 (diff) | |
| download | CMake-af1f6987571b6f8298b03e184aa4aad23882d5c8.zip CMake-af1f6987571b6f8298b03e184aa4aad23882d5c8.tar.gz CMake-af1f6987571b6f8298b03e184aa4aad23882d5c8.tar.bz2 | |
CMP0024: Store the fact of included export in global generator.
Storing it in the makefile means that the policy does not trigger
when include and export are in differing directories.
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; |