summaryrefslogtreecommitdiffstats
path: root/Source/cmComputeLinkInformation.cxx
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2008-04-18 21:32:15 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2008-04-18 21:32:15 (GMT)
commitb017a02b901061223ba4cec9549a6b5df66f0d2e (patch)
tree369161d477241a2f6d307d05016c7328fa50b573 /Source/cmComputeLinkInformation.cxx
parente7948f89f924318de297da415a11ccfedd4d2cd9 (diff)
downloadCMake-b017a02b901061223ba4cec9549a6b5df66f0d2e.zip
CMake-b017a02b901061223ba4cec9549a6b5df66f0d2e.tar.gz
CMake-b017a02b901061223ba4cec9549a6b5df66f0d2e.tar.bz2
ENH: only complain about -l stuff for CMP0003
Diffstat (limited to 'Source/cmComputeLinkInformation.cxx')
-rw-r--r--Source/cmComputeLinkInformation.cxx6
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index 878c3d6..5e10537 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -1187,7 +1187,11 @@ void cmComputeLinkInformation::AddUserItem(std::string const& item)
}
else if(item[0] == '-' || item[0] == '$' || item[0] == '`')
{
- if(item.find("-framework") != 0)
+ // if this is a -l option then we might need to warn about
+ // CMP0003 so put it in OldUserFlagItems, if it is not a -l
+ // or -Wl,-l (-framework -pthread), then allow it without a
+ // CMP0003 as -L will not affect those other linker flags
+ if(item.find("-l") == 0 || item.find("-Wl,-l") == 0)
{
// This is a linker option provided by the user.
this->OldUserFlagItems.push_back(item);