summaryrefslogtreecommitdiffstats
path: root/Source/cmOrderLinkDirectories.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2005-11-22 21:59:31 (GMT)
committerBrad King <brad.king@kitware.com>2005-11-22 21:59:31 (GMT)
commit130d469dd4e66d2cb9b24f60887564f0df355f34 (patch)
tree46edcb0bbd352067f5c23fbe4688476208a1a9af /Source/cmOrderLinkDirectories.cxx
parent76724c23bff8b5adcded34f73a4d18123b8b1fe8 (diff)
downloadCMake-130d469dd4e66d2cb9b24f60887564f0df355f34.zip
CMake-130d469dd4e66d2cb9b24f60887564f0df355f34.tar.gz
CMake-130d469dd4e66d2cb9b24f60887564f0df355f34.tar.bz2
BUG: Do not accept a directory name as a library.
Diffstat (limited to 'Source/cmOrderLinkDirectories.cxx')
-rw-r--r--Source/cmOrderLinkDirectories.cxx20
1 files changed, 10 insertions, 10 deletions
diff --git a/Source/cmOrderLinkDirectories.cxx b/Source/cmOrderLinkDirectories.cxx
index b0e0d6b..94b6160 100644
--- a/Source/cmOrderLinkDirectories.cxx
+++ b/Source/cmOrderLinkDirectories.cxx
@@ -280,18 +280,18 @@ bool cmOrderLinkDirectories::DetermineLibraryPathOrder()
std::vector<cmStdString> empty;
for(unsigned int i=0; i < m_RawLinkItems.size(); ++i)
{
- if(cmSystemTools::FileIsDirectory(m_RawLinkItems[i].c_str()))
- {
- std::string message = "Warning: Ignoring path found in link libraries for target: ";
- message += m_TargetName;
- message += ", path is: ";
- message += m_RawLinkItems[i];
- message += ". Expected a library name or a full path to a library name.";
- cmSystemTools::Message(message.c_str());
- continue;
- }
if(cmSystemTools::FileIsFullPath(m_RawLinkItems[i].c_str()))
{
+ if(cmSystemTools::FileIsDirectory(m_RawLinkItems[i].c_str()))
+ {
+ std::string message = "Warning: Ignoring path found in link libraries for target: ";
+ message += m_TargetName;
+ message += ", path is: ";
+ message += m_RawLinkItems[i];
+ message += ". Expected a library name or a full path to a library name.";
+ cmSystemTools::Message(message.c_str());
+ continue;
+ }
cmSystemTools::SplitProgramPath(m_RawLinkItems[i].c_str(),
dir, file);
m_DirectoryToAfterList[dir] = empty;