diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2001-01-12 19:05:11 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2001-01-12 19:05:11 (GMT) |
| commit | 85d16dbd3568f2d21c2fc94284a33b093358ef4a (patch) | |
| tree | caa34b51525972341082d7aa6ca9c6c4b510bc71 /Source | |
| parent | 7ae5e97a3d6053de835f8b30759e05210ebb2c2a (diff) | |
| download | CMake-85d16dbd3568f2d21c2fc94284a33b093358ef4a.zip CMake-85d16dbd3568f2d21c2fc94284a33b093358ef4a.tar.gz CMake-85d16dbd3568f2d21c2fc94284a33b093358ef4a.tar.bz2 | |
ENH: add define flags in the right place
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmDSPMakefile.cxx | 6 | ||||
| -rw-r--r-- | Source/cmDSPWriter.cxx | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Source/cmDSPMakefile.cxx b/Source/cmDSPMakefile.cxx index 6c0784b..0687c73 100644 --- a/Source/cmDSPMakefile.cxx +++ b/Source/cmDSPMakefile.cxx @@ -75,10 +75,8 @@ void cmDSPMakefile::OutputDSPFile() } m_DebugLibraryOptions += "/STACK:10000000 "; // add any extra define flags - m_DebugLibraryOptions += m_Makefile->GetDefineFlags(); m_ReleaseLibraryOptions = m_DebugLibraryOptions; cmSystemTools::ReplaceString(m_ReleaseLibraryOptions, "Debug", "Release"); - // If the output directory is not the m_cmHomeDirectory // then create it. if(strcmp(m_Makefile->GetOutputDirectory(), @@ -265,6 +263,7 @@ void cmDSPMakefile::WriteDSPHeader(std::ostream& fout) Die(message.c_str()); } char buffer[2048]; + while(fin) { fin.getline(buffer, 2048); @@ -278,7 +277,8 @@ void cmDSPMakefile::WriteDSPHeader(std::ostream& fout) cmSystemTools::ReplaceString(line, "OUTPUT_LIBNAME", m_Makefile->GetLibraryName()); cmSystemTools::ReplaceString(line, - "EXTRA_DEFINES", ""); + "EXTRA_DEFINES", + m_Makefile->GetDefineFlags()); fout << line.c_str() << std::endl; } } diff --git a/Source/cmDSPWriter.cxx b/Source/cmDSPWriter.cxx index 6c0784b..0687c73 100644 --- a/Source/cmDSPWriter.cxx +++ b/Source/cmDSPWriter.cxx @@ -75,10 +75,8 @@ void cmDSPMakefile::OutputDSPFile() } m_DebugLibraryOptions += "/STACK:10000000 "; // add any extra define flags - m_DebugLibraryOptions += m_Makefile->GetDefineFlags(); m_ReleaseLibraryOptions = m_DebugLibraryOptions; cmSystemTools::ReplaceString(m_ReleaseLibraryOptions, "Debug", "Release"); - // If the output directory is not the m_cmHomeDirectory // then create it. if(strcmp(m_Makefile->GetOutputDirectory(), @@ -265,6 +263,7 @@ void cmDSPMakefile::WriteDSPHeader(std::ostream& fout) Die(message.c_str()); } char buffer[2048]; + while(fin) { fin.getline(buffer, 2048); @@ -278,7 +277,8 @@ void cmDSPMakefile::WriteDSPHeader(std::ostream& fout) cmSystemTools::ReplaceString(line, "OUTPUT_LIBNAME", m_Makefile->GetLibraryName()); cmSystemTools::ReplaceString(line, - "EXTRA_DEFINES", ""); + "EXTRA_DEFINES", + m_Makefile->GetDefineFlags()); fout << line.c_str() << std::endl; } } |