|
@@ -1639,9 +1639,9 @@ void cmLocalVisualStudio6Generator
|
|
|
// store flags for each configuration
|
|
// store flags for each configuration
|
|
|
std::string flags = " ";
|
|
std::string flags = " ";
|
|
|
std::string flagsRelease = " ";
|
|
std::string flagsRelease = " ";
|
|
|
- std::string flagsMinSize = " ";
|
|
|
|
|
|
|
+ std::string flagsMinSizeRel = " ";
|
|
|
std::string flagsDebug = " ";
|
|
std::string flagsDebug = " ";
|
|
|
- std::string flagsDebugRel = " ";
|
|
|
|
|
|
|
+ std::string flagsRelWithDebInfo = " ";
|
|
|
if(target.GetType() >= cmTarget::EXECUTABLE &&
|
|
if(target.GetType() >= cmTarget::EXECUTABLE &&
|
|
|
target.GetType() <= cmTarget::OBJECT_LIBRARY)
|
|
target.GetType() <= cmTarget::OBJECT_LIBRARY)
|
|
|
{
|
|
{
|
|
@@ -1664,16 +1664,16 @@ void cmLocalVisualStudio6Generator
|
|
|
flagsRelease += " -DCMAKE_INTDIR=\\\"Release\\\" ";
|
|
flagsRelease += " -DCMAKE_INTDIR=\\\"Release\\\" ";
|
|
|
|
|
|
|
|
flagVar = baseFlagVar + "_MINSIZEREL";
|
|
flagVar = baseFlagVar + "_MINSIZEREL";
|
|
|
- flagsMinSize = this->Makefile->GetSafeDefinition(flagVar.c_str());
|
|
|
|
|
- flagsMinSize += " -DCMAKE_INTDIR=\\\"MinSizeRel\\\" ";
|
|
|
|
|
|
|
+ flagsMinSizeRel = this->Makefile->GetSafeDefinition(flagVar.c_str());
|
|
|
|
|
+ flagsMinSizeRel += " -DCMAKE_INTDIR=\\\"MinSizeRel\\\" ";
|
|
|
|
|
|
|
|
flagVar = baseFlagVar + "_DEBUG";
|
|
flagVar = baseFlagVar + "_DEBUG";
|
|
|
flagsDebug = this->Makefile->GetSafeDefinition(flagVar.c_str());
|
|
flagsDebug = this->Makefile->GetSafeDefinition(flagVar.c_str());
|
|
|
flagsDebug += " -DCMAKE_INTDIR=\\\"Debug\\\" ";
|
|
flagsDebug += " -DCMAKE_INTDIR=\\\"Debug\\\" ";
|
|
|
|
|
|
|
|
flagVar = baseFlagVar + "_RELWITHDEBINFO";
|
|
flagVar = baseFlagVar + "_RELWITHDEBINFO";
|
|
|
- flagsDebugRel = this->Makefile->GetSafeDefinition(flagVar.c_str());
|
|
|
|
|
- flagsDebugRel += " -DCMAKE_INTDIR=\\\"RelWithDebInfo\\\" ";
|
|
|
|
|
|
|
+ flagsRelWithDebInfo = this->Makefile->GetSafeDefinition(flagVar.c_str());
|
|
|
|
|
+ flagsRelWithDebInfo += " -DCMAKE_INTDIR=\\\"RelWithDebInfo\\\" ";
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
// if _UNICODE and _SBCS are not found, then add -D_MBCS
|
|
// if _UNICODE and _SBCS are not found, then add -D_MBCS
|
|
@@ -1731,19 +1731,19 @@ void cmLocalVisualStudio6Generator
|
|
|
flags += defines;
|
|
flags += defines;
|
|
|
flagsDebug += debugDefines;
|
|
flagsDebug += debugDefines;
|
|
|
flagsRelease += releaseDefines;
|
|
flagsRelease += releaseDefines;
|
|
|
- flagsMinSize += minsizeDefines;
|
|
|
|
|
- flagsDebugRel += debugrelDefines;
|
|
|
|
|
|
|
+ flagsMinSizeRel += minsizeDefines;
|
|
|
|
|
+ flagsRelWithDebInfo += debugrelDefines;
|
|
|
|
|
|
|
|
// The template files have CXX FLAGS in them, that need to be replaced.
|
|
// The template files have CXX FLAGS in them, that need to be replaced.
|
|
|
// There are not separate CXX and C template files, so we use the same
|
|
// There are not separate CXX and C template files, so we use the same
|
|
|
// variable names. The previous code sets up flags* variables to contain
|
|
// variable names. The previous code sets up flags* variables to contain
|
|
|
// the correct C or CXX flags
|
|
// the correct C or CXX flags
|
|
|
cmSystemTools::ReplaceString(line, "CMAKE_CXX_FLAGS_MINSIZEREL",
|
|
cmSystemTools::ReplaceString(line, "CMAKE_CXX_FLAGS_MINSIZEREL",
|
|
|
- flagsMinSize.c_str());
|
|
|
|
|
|
|
+ flagsMinSizeRel.c_str());
|
|
|
cmSystemTools::ReplaceString(line, "CMAKE_CXX_FLAGS_DEBUG",
|
|
cmSystemTools::ReplaceString(line, "CMAKE_CXX_FLAGS_DEBUG",
|
|
|
flagsDebug.c_str());
|
|
flagsDebug.c_str());
|
|
|
cmSystemTools::ReplaceString(line, "CMAKE_CXX_FLAGS_RELWITHDEBINFO",
|
|
cmSystemTools::ReplaceString(line, "CMAKE_CXX_FLAGS_RELWITHDEBINFO",
|
|
|
- flagsDebugRel.c_str());
|
|
|
|
|
|
|
+ flagsRelWithDebInfo.c_str());
|
|
|
cmSystemTools::ReplaceString(line, "CMAKE_CXX_FLAGS_RELEASE",
|
|
cmSystemTools::ReplaceString(line, "CMAKE_CXX_FLAGS_RELEASE",
|
|
|
flagsRelease.c_str());
|
|
flagsRelease.c_str());
|
|
|
cmSystemTools::ReplaceString(line, "CMAKE_CXX_FLAGS", flags.c_str());
|
|
cmSystemTools::ReplaceString(line, "CMAKE_CXX_FLAGS", flags.c_str());
|