diff options
author | Brad King <brad.king@kitware.com> | 2013-06-14 13:01:17 (GMT) |
---|---|---|
committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-06-14 13:01:17 (GMT) |
commit | 1f8733a0c25442a90397f0f7dd0fcb583b15ae8e (patch) | |
tree | 918e22f248aff7faa0ed9834ba3ef7588f1b4df7 | |
parent | 2acbd419e2db4901c45f9ffe4d85752004371d5e (diff) | |
parent | 22f7934a6e9c3dd350ec3ed6db91821783cd98a2 (diff) | |
download | CMake-1f8733a0c25442a90397f0f7dd0fcb583b15ae8e.zip CMake-1f8733a0c25442a90397f0f7dd0fcb583b15ae8e.tar.gz CMake-1f8733a0c25442a90397f0f7dd0fcb583b15ae8e.tar.bz2 |
Merge topic 'FixEclipseCorruptProjects'
22f7934 Eclipse: fix #14204 and #14205: no file links to directories
-rw-r--r-- | Source/cmExtraEclipseCDT4Generator.cxx | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx index 6b02e15..d80e775 100644 --- a/Source/cmExtraEclipseCDT4Generator.cxx +++ b/Source/cmExtraEclipseCDT4Generator.cxx @@ -554,12 +554,15 @@ void cmExtraEclipseCDT4Generator::CreateLinksForTargets( fileIt != sFiles.end(); ++fileIt) { - std::string linkName4 = linkName3; - linkName4 += "/"; - linkName4 += - cmSystemTools::GetFilenameName((*fileIt)->GetFullPath()); - this->AppendLinkedResource(fout, linkName4, - (*fileIt)->GetFullPath(), LinkToFile); + std::string fullPath = (*fileIt)->GetFullPath(); + if (!cmSystemTools::FileIsDirectory(fullPath.c_str())) + { + std::string linkName4 = linkName3; + linkName4 += "/"; + linkName4 += cmSystemTools::GetFilenameName(fullPath); + this->AppendLinkedResource(fout, linkName4, + fullPath, LinkToFile); + } } } } |