summaryrefslogtreecommitdiffstats
path: root/Source/cmLocalVisualStudio6Generator.cxx
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2004-04-22 20:58:04 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2004-04-22 20:58:04 (GMT)
commit7b576866b78ae1c6ba5dfc180d4b4f4b64f48872 (patch)
tree5d229cb06dc5183729564fd3830e01b06e60d182 /Source/cmLocalVisualStudio6Generator.cxx
parent8ba5612136d6d37db1abec8041be9dad2b834949 (diff)
downloadCMake-7b576866b78ae1c6ba5dfc180d4b4f4b64f48872.zip
CMake-7b576866b78ae1c6ba5dfc180d4b4f4b64f48872.tar.gz
CMake-7b576866b78ae1c6ba5dfc180d4b4f4b64f48872.tar.bz2
ENH: add support for static library property STATIC_LIBRARY_FLAGS
Diffstat (limited to 'Source/cmLocalVisualStudio6Generator.cxx')
-rw-r--r--Source/cmLocalVisualStudio6Generator.cxx16
1 files changed, 14 insertions, 2 deletions
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index 118874a..cf863a5 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -979,7 +979,15 @@ void cmLocalVisualStudio6Generator::WriteDSPHeader(std::ostream& fout, const cha
{
cmSystemTools::Error("Error Reading ", m_DSPHeaderTemplate.c_str());
}
-
+ std::string staticLibOptions;
+ if(target.GetType() == cmTarget::STATIC_LIBRARY )
+ {
+ if(const char* libflags = target.GetProperty("STATIC_LIBRARY_FLAGS"))
+ {
+ staticLibOptions = libflags;
+ }
+ }
+
std::string line;
while(cmSystemTools::GetLineFromStream(fin, line))
{
@@ -992,7 +1000,11 @@ void cmLocalVisualStudio6Generator::WriteDSPHeader(std::ostream& fout, const cha
customRuleCode.c_str());
cmSystemTools::ReplaceString(line, "CMAKE_MFC_FLAG",
mfcFlag);
-
+ if(target.GetType() == cmTarget::STATIC_LIBRARY )
+ {
+ cmSystemTools::ReplaceString(line, "CM_STATIC_LIB_ARGS",
+ staticLibOptions.c_str());
+ }
cmSystemTools::ReplaceString(line, "CM_LIBRARIES",
libOptions.c_str());
cmSystemTools::ReplaceString(line, "CM_DEBUG_LIBRARIES",