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

BUG: revert part of patch that set executable debug prefix as it breaks too much stuff

Browse Source
This commit is contained in:
Bill Hoffman 2005-07-13 16:49:51 -04:00
parent 1b115dc2e3
commit 3d5a724deb
1 changed files with 5 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
Source/cmLocalVisualStudio6Generator.cxx
View File

@ -780,7 +780,6 @@ void cmLocalVisualStudio6Generator
libPath = m_Makefile->GetDefinition("LIBRARY_OUTPUT_PATH"); libPath = m_Makefile->GetDefinition("LIBRARY_OUTPUT_PATH");
} }
std::string exePath = ""; std::string exePath = "";
std::string exePathDebug = "";
if (m_Makefile->GetDefinition("EXECUTABLE_OUTPUT_PATH")) if (m_Makefile->GetDefinition("EXECUTABLE_OUTPUT_PATH"))
{ {
exePath = m_Makefile->GetDefinition("EXECUTABLE_OUTPUT_PATH"); exePath = m_Makefile->GetDefinition("EXECUTABLE_OUTPUT_PATH");
@ -975,37 +974,10 @@ void cmLocalVisualStudio6Generator
// if the executable has an output name then add the appropriate flag // if the executable has an output name then add the appropriate flag
if (target.GetProperty("OUTPUT_NAME")) if (target.GetProperty("OUTPUT_NAME"))
{ {
std::string outputname = target.GetProperty("OUTPUT_NAME");
libMultiLineOptions += "# ADD LINK32 /out:"; libMultiLineOptions += "# ADD LINK32 /out:";
libMultiLineOptions += outputname; libMultiLineOptions += target.GetProperty("OUTPUT_NAME");
libMultiLineOptions += " \n"; libMultiLineOptions += " \n";
} }
else
{
libMultiLineOptions += "# ADD LINK32 /out:\"";
if(exePath != "")
{
libMultiLineOptions += exePath + "/" + libName + ".exe";
}
else
{
libMultiLineOptions += std::string(libName) + ".exe";
}
libMultiLineOptions += "\"\n";
libMultiLineOptionsForDebug += "# ADD LINK32 /out:\"";
if(exePath != "")
{
libMultiLineOptionsForDebug += exePath + "$(INTDIR)/" + libName + "D.exe";
}
else
{
libMultiLineOptionsForDebug += std::string("$(INTDIR)/")
+ std::string(libName) + "D.exe";
}
libMultiLineOptionsForDebug += "\"\n";
}
} }
if(target.GetType() == cmTarget::SHARED_LIBRARY) if(target.GetType() == cmTarget::SHARED_LIBRARY)
{ {
@ -1114,7 +1086,6 @@ void cmLocalVisualStudio6Generator
libDebugOptions.c_str()); libDebugOptions.c_str());
cmSystemTools::ReplaceString(line, "CM_OPTIMIZED_LIBRARIES", cmSystemTools::ReplaceString(line, "CM_OPTIMIZED_LIBRARIES",
libOptimizedOptions.c_str()); libOptimizedOptions.c_str());
cmSystemTools::ReplaceString(line, "CM_MULTILINE_LIBRARIES_FOR_DEBUG", cmSystemTools::ReplaceString(line, "CM_MULTILINE_LIBRARIES_FOR_DEBUG",
libMultiLineOptionsForDebug.c_str()); libMultiLineOptionsForDebug.c_str());
cmSystemTools::ReplaceString(line, "CM_MULTILINE_LIBRARIES", cmSystemTools::ReplaceString(line, "CM_MULTILINE_LIBRARIES",
@ -1134,28 +1105,11 @@ void cmLocalVisualStudio6Generator
cmSystemTools::ReplaceString(line, "LIBRARY_OUTPUT_PATH", cmSystemTools::ReplaceString(line, "LIBRARY_OUTPUT_PATH",
removeQuotes( removeQuotes(
this->ConvertToOptionallyRelativeOutputPath(libPath.c_str())).c_str()); this->ConvertToOptionallyRelativeOutputPath(libPath.c_str())).c_str());
cmSystemTools::ReplaceString(line, "EXECUTABLE_OUTPUT_PATH",
removeQuotes(
this->ConvertToOptionallyRelativeOutputPath(exePath.c_str())).c_str());
if (!m_Makefile->GetDefinition("EXECUTABLE_OUTPUT_PATH_OVERRIDE") || exePath == "")
{
cmSystemTools::ReplaceString(line, "EXECUTABLE_OUTPUT_PATH",
removeQuotes(
this->ConvertToOptionallyRelativeOutputPath(exePath.c_str())).c_str());
} else
{
cmSystemTools::ReplaceString(line, "EXECUTABLE_OUTPUT_PATHRelease",
removeQuotes(
this->ConvertToOptionallyRelativeOutputPath(exePath.c_str())).c_str());
cmSystemTools::ReplaceString(line, "EXECUTABLE_OUTPUT_PATHDebug",
removeQuotes(
this->ConvertToOptionallyRelativeOutputPath(exePath.c_str())).c_str());
cmSystemTools::ReplaceString(line, "EXECUTABLE_OUTPUT_PATHMinSizeRel",
removeQuotes(
this->ConvertToOptionallyRelativeOutputPath(exePath.c_str())).c_str());
cmSystemTools::ReplaceString(line, "EXECUTABLE_OUTPUT_PATHRelWithDebInfo",
removeQuotes(
this->ConvertToOptionallyRelativeOutputPath(exePath.c_str())).c_str());
}
cmSystemTools::ReplaceString(line, cmSystemTools::ReplaceString(line,
"EXTRA_DEFINES", "EXTRA_DEFINES",
m_Makefile->GetDefineFlags()); m_Makefile->GetDefineFlags());