mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-28 18:09:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

ENH: Make link interface mode more distinct

Browse Source 
Rename the recently added INTERFACE mode of the target_link_libraries()
command to LINK_INTERFACE_LIBRARIES.  This makes it much more distinct
from a normal call to the command, and clearly states its connection to
the property of the same name.  Also require the option to appear
immediately after the target name to make it a mode rather than an
option.
This commit is contained in:
Brad King
2008-08-18 10:11:29 -04:00
parent 7f7068e9d4
commit 94c1fe83fd
3 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmTargetLinkLibrariesCommand.cxx
+16 -9
View File
@@ -64,15 +64,22 @@ bool cmTargetLinkLibrariesCommand
// add libraries, nothe that there is an optional prefix
// of debug and optimized than can be used
std::vector<std::string>::const_iterator i = args.begin();
for(++i; i != args.end(); ++i)
for(unsigned int i=1; i < args.size(); ++i)
{
if(*i == "INTERFACE")
if(args[i] == "LINK_INTERFACE_LIBRARIES")
{
this->DoingInterface = true;
if(i != 1)
{
this->Makefile->IssueMessage(
cmake::FATAL_ERROR,
"The LINK_INTERFACE_LIBRARIES option must appear as the second "
"argument, just after the target name."
);
return true;
}
}
else if(*i == "debug")
else if(args[i] == "debug")
{
if(haveLLT)
{
@@ -81,7 +88,7 @@ bool cmTargetLinkLibrariesCommand
llt = cmTarget::DEBUG;
haveLLT = true;
}
else if(*i == "optimized")
else if(args[i] == "optimized")
{
if(haveLLT)
{
@@ -90,7 +97,7 @@ bool cmTargetLinkLibrariesCommand
llt = cmTarget::OPTIMIZED;
haveLLT = true;
}
else if(*i == "general")
else if(args[i] == "general")
{
if(haveLLT)
{
@@ -103,7 +110,7 @@ bool cmTargetLinkLibrariesCommand
{
// The link type was specified by the previous argument.
haveLLT = false;
this->HandleLibrary(i->c_str(), llt);
this->HandleLibrary(args[i].c_str(), llt);
}
else
{
@@ -129,7 +136,7 @@ bool cmTargetLinkLibrariesCommand
llt = cmTarget::OPTIMIZED;
}
}
this->HandleLibrary(i->c_str(), llt);
this->HandleLibrary(args[i].c_str(), llt);
}
}