summaryrefslogtreecommitdiffstats
path: root/Source/cmw9xcom.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2013-02-14 15:17:22 (GMT)
committerBrad King <brad.king@kitware.com>2013-02-14 15:18:31 (GMT)
commit95a9c80cacea50e2b5d52d67d0a7f5c9b50192dd (patch)
tree05d5e8dfb1b303549ba5f3570eb6ec903e95c97f /Source/cmw9xcom.cxx
parentbaa33acbdaa3bf88fe1fc591562574ab43b056fe (diff)
parent765386279815f208c5f83b1ad2b66776e990feb9 (diff)
downloadCMake-95a9c80cacea50e2b5d52d67d0a7f5c9b50192dd.zip
CMake-95a9c80cacea50e2b5d52d67d0a7f5c9b50192dd.tar.gz
CMake-95a9c80cacea50e2b5d52d67d0a7f5c9b50192dd.tar.bz2
Merge topic 'LINK_LIBRARIES-property' into rpath-use-implicit-link-dirs
Resolve a logical conflict in the signature of cmTarget::GetLinkClosure.
Diffstat (limited to 'Source/cmw9xcom.cxx')
-rw-r--r--Source/cmw9xcom.cxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/cmw9xcom.cxx b/Source/cmw9xcom.cxx
index e6014b3..ab238d5 100644
--- a/Source/cmw9xcom.cxx
+++ b/Source/cmw9xcom.cxx
@@ -31,14 +31,14 @@ int main (int argc, char *argv[])
int cc;
for ( cc = 2; cc < argc; cc ++ )
{
- std::string arg = argv[cc];
- if ( (arg.find_first_of(" ") != arg.npos) &&
- (arg.find_first_of("\"") == arg.npos) )
+ std::string nextArg = argv[cc];
+ if ( (nextArg.find_first_of(" ") != nextArg.npos) &&
+ (nextArg.find_first_of("\"") == nextArg.npos) )
{
- arg = "\"" + arg + "\"";
+ nextArg = "\"" + nextArg + "\"";
}
command += " ";
- command += arg;
+ command += nextArg;
}
return cmWin32ProcessExecution::Windows9xHack(command.c_str());