summaryrefslogtreecommitdiffstats
path: root/Source/cmLocalVisualStudio6Generator.cxx
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2008-09-09 17:04:30 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2008-09-09 17:04:30 (GMT)
commit364ac7e38613829b7e39cb7f80229f9734fa7a57 (patch)
tree239a02d1d0ae3261795a853eb6c1f8520e74164e /Source/cmLocalVisualStudio6Generator.cxx
parent4d3ae30bee240d270582ad5528b1b404c3b98517 (diff)
downloadCMake-364ac7e38613829b7e39cb7f80229f9734fa7a57.zip
CMake-364ac7e38613829b7e39cb7f80229f9734fa7a57.tar.gz
CMake-364ac7e38613829b7e39cb7f80229f9734fa7a57.tar.bz2
BUG: fix empty /D option for vs6, fix for 7580
Diffstat (limited to 'Source/cmLocalVisualStudio6Generator.cxx')
-rw-r--r--Source/cmLocalVisualStudio6Generator.cxx9
1 files changed, 8 insertions, 1 deletions
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index b396f22..aa29f04 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -1314,6 +1314,13 @@ void cmLocalVisualStudio6Generator
}
std::string line;
+ std::string libnameExports;
+ if(exportSymbol.size())
+ {
+ libnameExports = "/D \"";
+ libnameExports += exportSymbol;
+ libnameExports += "\"";
+ }
while(cmSystemTools::GetLineFromStream(fin, line))
{
const char* mfcFlag = this->Makefile->GetDefinition("CMAKE_MFC_FLAG");
@@ -1322,7 +1329,7 @@ void cmLocalVisualStudio6Generator
mfcFlag = "0";
}
cmSystemTools::ReplaceString(line, "OUTPUT_LIBNAME_EXPORTS",
- exportSymbol.c_str());
+ libnameExports.c_str());
cmSystemTools::ReplaceString(line, "CMAKE_MFC_FLAG",
mfcFlag);
if(target.GetType() == cmTarget::STATIC_LIBRARY )