diff options
author | Brad King <brad.king@kitware.com> | 2002-10-10 14:43:59 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2002-10-10 14:43:59 (GMT) |
commit | 281f7519e1707bd30ce8f9368b7515396f713af9 (patch) | |
tree | 560dd62bf62c26753d47b870c405677bb30eceb0 /Source/cmLocalNMakeMakefileGenerator.cxx | |
parent | 65cc289047fc2a4b444838c690d9bd45eca04f7e (diff) | |
download | CMake-281f7519e1707bd30ce8f9368b7515396f713af9.zip CMake-281f7519e1707bd30ce8f9368b7515396f713af9.tar.gz CMake-281f7519e1707bd30ce8f9368b7515396f713af9.tar.bz2 |
ENH: Renamed cmStringStream to cmOStringStream and added cmIStringStream. Removed cmInputStringStream.
Diffstat (limited to 'Source/cmLocalNMakeMakefileGenerator.cxx')
-rw-r--r-- | Source/cmLocalNMakeMakefileGenerator.cxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/Source/cmLocalNMakeMakefileGenerator.cxx b/Source/cmLocalNMakeMakefileGenerator.cxx index 4f3cee6..2bed0ad 100644 --- a/Source/cmLocalNMakeMakefileGenerator.cxx +++ b/Source/cmLocalNMakeMakefileGenerator.cxx @@ -84,7 +84,7 @@ std::string cmLocalNMakeMakefileGenerator::ShortPathCommand(const char* command) cmRegularExpression removeIntDir("(.*)(/|\\\\)\\$\\(IntDir\\)(.*)"); if(removeIntDir.find(c)) { - c = removeIntDir.match(1) + removeIntDir.match(3); + c = removeIntDir.match(1) + removeIntDir.match(3); } std::string unixPath = c; // since the command may already be a windows path, convert it @@ -407,7 +407,7 @@ void cmLocalNMakeMakefileGenerator::OutputSharedLibraryRule(std::ostream& fout, command += " $(" + this->CreateMakeVariable(name, "_SRC_OBJS") + ") "; - cmStringStream linklibs; + cmOStringStream linklibs; this->OutputLinkLibraries(linklibs, name, t); command += linklibs.str(); @@ -528,7 +528,7 @@ void cmLocalNMakeMakefileGenerator::OutputExecutableRule(std::ostream& fout, command += " /subsystem:windows "; } - cmStringStream linklibs; + cmOStringStream linklibs; this->OutputLinkLibraries(linklibs, 0, t); command += linklibs.str(); @@ -614,16 +614,16 @@ void cmLocalNMakeMakefileGenerator::OutputLinkLibraries(std::ostream& fout, // if it ends in .lib, then it is a full path and should // be escaped, and does not need .lib added if(reg.find(lib->first)) - { - librariesLinked += ShortPath(lib->first.c_str()); - librariesLinked += " "; - } + { + librariesLinked += ShortPath(lib->first.c_str()); + librariesLinked += " "; + } else - { + { librariesLinked += m_LibraryLinkOption; - librariesLinked += lib->first; - librariesLinked += m_StaticLibraryExtension + " "; - } + librariesLinked += lib->first; + librariesLinked += m_StaticLibraryExtension + " "; + } } } linkLibs += librariesLinked; |