kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BUG: fix for bug 91

Browse Source
This commit is contained in:
Bill Hoffman 2004-04-16 09:50:31 -04:00
parent 685be51a0e
commit 62bd5b7c8c
1 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Source/cmLocalVisualStudio7Generator.cxx
View File

@ -283,7 +283,14 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
int runtime = 0; int runtime = 0;
int optimized = 0; int optimized = 0;
int inlineFunctions = 0; int inlineFunctions = 0;
std::string programDatabase;
const char* pre = "WIN32,_DEBUG,_WINDOWS"; const char* pre = "WIN32,_DEBUG,_WINDOWS";
std::string debugPostfix = "";
bool debug = !strcmp(configName,"Debug");
if (debug && m_Makefile->GetDefinition("CMAKE_DEBUG_POSTFIX"))
{
debugPostfix = m_Makefile->GetDefinition("CMAKE_DEBUG_POSTFIX");
}
// set the flags and defaults for // set the flags and defaults for
// runtime, optimized, and inlineFunctions , and // runtime, optimized, and inlineFunctions , and
// default pre processor flags // default pre processor flags
@ -294,6 +301,11 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
optimized = 0; optimized = 0;
runtime = 3; runtime = 3;
pre = "WIN32,_DEBUG,_WINDOWS"; pre = "WIN32,_DEBUG,_WINDOWS";
std::string libpath = m_LibraryOutputPath +
"$(OutDir)/" + libName + debugPostfix + ".pdb";
programDatabase = "\t\t\t\tProgramDatabaseFileName=\"";
programDatabase += libpath;
programDatabase += "\"";
} }
else if (strcmp(configName, "Release") == 0) else if (strcmp(configName, "Release") == 0)
{ {
@ -318,6 +330,11 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
runtime = 2; runtime = 2;
pre = "WIN32,NDEBUG,_WINDOWS"; pre = "WIN32,NDEBUG,_WINDOWS";
flags += flagsDebugRel; flags += flagsDebugRel;
std::string libpath = m_LibraryOutputPath +
"$(OutDir)/" + libName + debugPostfix + ".pdb";
programDatabase = "\t\t\t\tProgramDatabaseFileName=\"";
programDatabase += libpath;
programDatabase += "\"";
} }
fout << "\t\t\tIntermediateDirectory=\".\\" << configName << "\"\n" fout << "\t\t\tIntermediateDirectory=\".\\" << configName << "\"\n"
@ -455,6 +472,10 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
{ {
fout << "\t\t\t\tWarningLevel=\"" << m_Makefile->GetDefinition("CMAKE_CXX_WARNING_LEVEL") << "\"\n"; fout << "\t\t\t\tWarningLevel=\"" << m_Makefile->GetDefinition("CMAKE_CXX_WARNING_LEVEL") << "\"\n";
} }
if(programDatabase.size())
{
fout << programDatabase << "\n";
}
fout << "\t\t\t\tDebugInformationFormat=\"" << debugFormat << "\""; fout << "\t\t\t\tDebugInformationFormat=\"" << debugFormat << "\"";
fout << "/>\n"; // end of <Tool Name=VCCLCompilerTool fout << "/>\n"; // end of <Tool Name=VCCLCompilerTool