BUG: VS6 generator now uses ComputeLinkInformation just like all other generators.
This commit is contained in:
parent
0b490110ba
commit
864c0292d5
|
@ -799,12 +799,45 @@ inline std::string removeQuotes(const std::string& s)
|
||||||
return s;
|
return s;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Code in blocks surrounded by a test for this definition is needed
|
||||||
|
// only for compatibility with user project's replacement DSP
|
||||||
|
// templates. The CMake templates no longer use them.
|
||||||
|
#define CM_USE_OLD_VS6
|
||||||
|
|
||||||
void cmLocalVisualStudio6Generator
|
void cmLocalVisualStudio6Generator
|
||||||
::WriteDSPHeader(std::ostream& fout,
|
::WriteDSPHeader(std::ostream& fout,
|
||||||
const char *libName, cmTarget &target,
|
const char *libName, cmTarget &target,
|
||||||
std::vector<cmSourceGroup> &)
|
std::vector<cmSourceGroup> &)
|
||||||
{
|
{
|
||||||
|
// Lookup the library and executable output directories.
|
||||||
|
std::string libPath;
|
||||||
|
if(this->Makefile->GetDefinition("LIBRARY_OUTPUT_PATH"))
|
||||||
|
{
|
||||||
|
libPath = this->Makefile->GetDefinition("LIBRARY_OUTPUT_PATH");
|
||||||
|
}
|
||||||
|
std::string exePath;
|
||||||
|
if(this->Makefile->GetDefinition("EXECUTABLE_OUTPUT_PATH"))
|
||||||
|
{
|
||||||
|
exePath = this->Makefile->GetDefinition("EXECUTABLE_OUTPUT_PATH");
|
||||||
|
}
|
||||||
|
|
||||||
|
// Make sure there are trailing slashes.
|
||||||
|
if(!libPath.empty())
|
||||||
|
{
|
||||||
|
if(libPath[libPath.size()-1] != '/')
|
||||||
|
{
|
||||||
|
libPath += "/";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if(!exePath.empty())
|
||||||
|
{
|
||||||
|
if(exePath[exePath.size()-1] != '/')
|
||||||
|
{
|
||||||
|
exePath += "/";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#ifdef CM_USE_OLD_VS6
|
||||||
std::set<std::string> pathEmitted;
|
std::set<std::string> pathEmitted;
|
||||||
|
|
||||||
// determine the link directories
|
// determine the link directories
|
||||||
|
@ -817,25 +850,8 @@ void cmLocalVisualStudio6Generator
|
||||||
std::string libMultiLineDebugOptions;
|
std::string libMultiLineDebugOptions;
|
||||||
std::string libMultiLineOptimizedOptions;
|
std::string libMultiLineOptimizedOptions;
|
||||||
|
|
||||||
// suppoirt override in output directory
|
|
||||||
std::string libPath = "";
|
|
||||||
if (this->Makefile->GetDefinition("LIBRARY_OUTPUT_PATH"))
|
|
||||||
{
|
|
||||||
libPath = this->Makefile->GetDefinition("LIBRARY_OUTPUT_PATH");
|
|
||||||
}
|
|
||||||
std::string exePath = "";
|
|
||||||
if (this->Makefile->GetDefinition("EXECUTABLE_OUTPUT_PATH"))
|
|
||||||
{
|
|
||||||
exePath = this->Makefile->GetDefinition("EXECUTABLE_OUTPUT_PATH");
|
|
||||||
|
|
||||||
}
|
|
||||||
if(libPath.size())
|
if(libPath.size())
|
||||||
{
|
{
|
||||||
// make sure there is a trailing slash
|
|
||||||
if(libPath[libPath.size()-1] != '/')
|
|
||||||
{
|
|
||||||
libPath += "/";
|
|
||||||
}
|
|
||||||
std::string lpath =
|
std::string lpath =
|
||||||
this->ConvertToOptionallyRelativeOutputPath(libPath.c_str());
|
this->ConvertToOptionallyRelativeOutputPath(libPath.c_str());
|
||||||
if(lpath.size() == 0)
|
if(lpath.size() == 0)
|
||||||
|
@ -868,11 +884,6 @@ void cmLocalVisualStudio6Generator
|
||||||
}
|
}
|
||||||
if(exePath.size())
|
if(exePath.size())
|
||||||
{
|
{
|
||||||
// make sure there is a trailing slash
|
|
||||||
if(exePath[exePath.size()-1] != '/')
|
|
||||||
{
|
|
||||||
exePath += "/";
|
|
||||||
}
|
|
||||||
std::string lpath =
|
std::string lpath =
|
||||||
this->ConvertToOptionallyRelativeOutputPath(exePath.c_str());
|
this->ConvertToOptionallyRelativeOutputPath(exePath.c_str());
|
||||||
if(lpath.size() == 0)
|
if(lpath.size() == 0)
|
||||||
|
@ -1013,13 +1024,13 @@ void cmLocalVisualStudio6Generator
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
// Get extra linker options for this target type.
|
// Get extra linker options for this target type.
|
||||||
std::string extraLinkOptions;
|
std::string extraLinkOptions;
|
||||||
if(target.GetType() == cmTarget::EXECUTABLE)
|
if(target.GetType() == cmTarget::EXECUTABLE)
|
||||||
{
|
{
|
||||||
extraLinkOptions =
|
extraLinkOptions = this->Makefile->GetRequiredDefinition("CMAKE_EXE_LINKER_FLAGS");
|
||||||
this->Makefile->GetRequiredDefinition("CMAKE_EXE_LINKER_FLAGS");
|
|
||||||
}
|
}
|
||||||
if(target.GetType() == cmTarget::SHARED_LIBRARY)
|
if(target.GetType() == cmTarget::SHARED_LIBRARY)
|
||||||
{
|
{
|
||||||
|
@ -1030,36 +1041,14 @@ void cmLocalVisualStudio6Generator
|
||||||
extraLinkOptions = this->Makefile->GetRequiredDefinition("CMAKE_MODULE_LINKER_FLAGS");
|
extraLinkOptions = this->Makefile->GetRequiredDefinition("CMAKE_MODULE_LINKER_FLAGS");
|
||||||
}
|
}
|
||||||
|
|
||||||
// Compute the real name of the target.
|
// Get extra linker options for this target.
|
||||||
std::string outputName = "(OUTPUT_NAME is for libraries and executables only)";
|
if(const char* targetLinkFlags = target.GetProperty("LINK_FLAGS"))
|
||||||
std::string outputNameDebug = outputName;
|
|
||||||
std::string outputNameRelease = outputName;
|
|
||||||
std::string outputNameMinSizeRel = outputName;
|
|
||||||
std::string outputNameRelWithDebInfo = outputName;
|
|
||||||
if(target.GetType() == cmTarget::EXECUTABLE ||
|
|
||||||
target.GetType() == cmTarget::STATIC_LIBRARY ||
|
|
||||||
target.GetType() == cmTarget::SHARED_LIBRARY ||
|
|
||||||
target.GetType() == cmTarget::MODULE_LIBRARY)
|
|
||||||
{
|
{
|
||||||
outputName = target.GetFullName();
|
extraLinkOptions += " ";
|
||||||
outputNameDebug = target.GetFullName("Debug");
|
extraLinkOptions += targetLinkFlags;
|
||||||
outputNameRelease = target.GetFullName("Release");
|
|
||||||
outputNameMinSizeRel = target.GetFullName("MinSizeRel");
|
|
||||||
outputNameRelWithDebInfo = target.GetFullName("RelWithDebInfo");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if(extraLinkOptions.size())
|
// Get standard libraries for this language.
|
||||||
{
|
|
||||||
libOptions += " ";
|
|
||||||
libOptions += extraLinkOptions;
|
|
||||||
libOptions += " ";
|
|
||||||
libMultiLineOptions += "# ADD LINK32 ";
|
|
||||||
libMultiLineOptions += extraLinkOptions;
|
|
||||||
libMultiLineOptions += " \n";
|
|
||||||
libMultiLineOptionsForDebug += "# ADD LINK32 ";
|
|
||||||
libMultiLineOptionsForDebug += extraLinkOptions;
|
|
||||||
libMultiLineOptionsForDebug += " \n";
|
|
||||||
}
|
|
||||||
if(target.GetType() >= cmTarget::EXECUTABLE &&
|
if(target.GetType() >= cmTarget::EXECUTABLE &&
|
||||||
target.GetType() <= cmTarget::MODULE_LIBRARY)
|
target.GetType() <= cmTarget::MODULE_LIBRARY)
|
||||||
{
|
{
|
||||||
|
@ -1082,29 +1071,63 @@ void cmLocalVisualStudio6Generator
|
||||||
if(const char* stdLibs =
|
if(const char* stdLibs =
|
||||||
this->Makefile->GetDefinition(standardLibsVar.c_str()))
|
this->Makefile->GetDefinition(standardLibsVar.c_str()))
|
||||||
{
|
{
|
||||||
libOptions += " ";
|
extraLinkOptions += " ";
|
||||||
libOptions += stdLibs;
|
extraLinkOptions += stdLibs;
|
||||||
libOptions += " ";
|
|
||||||
libMultiLineOptions += "# ADD LINK32 ";
|
|
||||||
libMultiLineOptions += stdLibs;
|
|
||||||
libMultiLineOptions += " \n";
|
|
||||||
libMultiLineOptionsForDebug += "# ADD LINK32 ";
|
|
||||||
libMultiLineOptionsForDebug += stdLibs;
|
|
||||||
libMultiLineOptionsForDebug += " \n";
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(const char* targetLinkFlags = target.GetProperty("LINK_FLAGS"))
|
|
||||||
|
// Compute the real name of the target.
|
||||||
|
std::string outputName = "(OUTPUT_NAME is for libraries and executables only)";
|
||||||
|
std::string outputNameDebug = outputName;
|
||||||
|
std::string outputNameRelease = outputName;
|
||||||
|
std::string outputNameMinSizeRel = outputName;
|
||||||
|
std::string outputNameRelWithDebInfo = outputName;
|
||||||
|
if(target.GetType() == cmTarget::EXECUTABLE ||
|
||||||
|
target.GetType() == cmTarget::STATIC_LIBRARY ||
|
||||||
|
target.GetType() == cmTarget::SHARED_LIBRARY ||
|
||||||
|
target.GetType() == cmTarget::MODULE_LIBRARY)
|
||||||
|
{
|
||||||
|
outputName = target.GetFullName();
|
||||||
|
outputNameDebug = target.GetFullName("Debug");
|
||||||
|
outputNameRelease = target.GetFullName("Release");
|
||||||
|
outputNameMinSizeRel = target.GetFullName("MinSizeRel");
|
||||||
|
outputNameRelWithDebInfo = target.GetFullName("RelWithDebInfo");
|
||||||
|
}
|
||||||
|
|
||||||
|
// Compute the proper link information for the target.
|
||||||
|
std::string optionsDebug;
|
||||||
|
std::string optionsRelease;
|
||||||
|
std::string optionsMinSizeRel;
|
||||||
|
std::string optionsRelWithDebInfo;
|
||||||
|
if(target.GetType() == cmTarget::EXECUTABLE ||
|
||||||
|
target.GetType() == cmTarget::SHARED_LIBRARY ||
|
||||||
|
target.GetType() == cmTarget::MODULE_LIBRARY)
|
||||||
|
{
|
||||||
|
this->ComputeLinkOptions(target, "Debug", extraLinkOptions,
|
||||||
|
optionsDebug);
|
||||||
|
this->ComputeLinkOptions(target, "Release", extraLinkOptions,
|
||||||
|
optionsRelease);
|
||||||
|
this->ComputeLinkOptions(target, "MinSizeRel", extraLinkOptions,
|
||||||
|
optionsMinSizeRel);
|
||||||
|
this->ComputeLinkOptions(target, "RelWithDebInfo", extraLinkOptions,
|
||||||
|
optionsRelWithDebInfo);
|
||||||
|
}
|
||||||
|
|
||||||
|
#ifdef CM_USE_OLD_VS6
|
||||||
|
// Compute link information for the target.
|
||||||
|
if(extraLinkOptions.size())
|
||||||
{
|
{
|
||||||
libOptions += " ";
|
libOptions += " ";
|
||||||
libOptions += targetLinkFlags;
|
libOptions += extraLinkOptions;
|
||||||
libOptions += " ";
|
libOptions += " ";
|
||||||
libMultiLineOptions += "# ADD LINK32 ";
|
libMultiLineOptions += "# ADD LINK32 ";
|
||||||
libMultiLineOptions += targetLinkFlags;
|
libMultiLineOptions += extraLinkOptions;
|
||||||
libMultiLineOptions += " \n";
|
libMultiLineOptions += " \n";
|
||||||
libMultiLineOptionsForDebug += "# ADD LINK32 ";
|
libMultiLineOptionsForDebug += "# ADD LINK32 ";
|
||||||
libMultiLineOptionsForDebug += targetLinkFlags;
|
libMultiLineOptionsForDebug += extraLinkOptions;
|
||||||
libMultiLineOptionsForDebug += " \n";
|
libMultiLineOptionsForDebug += " \n";
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
// are there any custom rules on the target itself
|
// are there any custom rules on the target itself
|
||||||
// only if the target is a lib or exe
|
// only if the target is a lib or exe
|
||||||
|
@ -1160,6 +1183,7 @@ void cmLocalVisualStudio6Generator
|
||||||
cmSystemTools::ReplaceString(line, "/nologo", "");
|
cmSystemTools::ReplaceString(line, "/nologo", "");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef CM_USE_OLD_VS6
|
||||||
cmSystemTools::ReplaceString(line, "CM_LIBRARIES",
|
cmSystemTools::ReplaceString(line, "CM_LIBRARIES",
|
||||||
libOptions.c_str());
|
libOptions.c_str());
|
||||||
cmSystemTools::ReplaceString(line, "CM_DEBUG_LIBRARIES",
|
cmSystemTools::ReplaceString(line, "CM_DEBUG_LIBRARIES",
|
||||||
|
@ -1174,6 +1198,7 @@ void cmLocalVisualStudio6Generator
|
||||||
libMultiLineDebugOptions.c_str());
|
libMultiLineDebugOptions.c_str());
|
||||||
cmSystemTools::ReplaceString(line, "CM_MULTILINE_OPTIMIZED_LIBRARIES",
|
cmSystemTools::ReplaceString(line, "CM_MULTILINE_OPTIMIZED_LIBRARIES",
|
||||||
libMultiLineOptimizedOptions.c_str());
|
libMultiLineOptimizedOptions.c_str());
|
||||||
|
#endif
|
||||||
|
|
||||||
// Substitute the real output name into the template.
|
// Substitute the real output name into the template.
|
||||||
cmSystemTools::ReplaceString(line, "OUTPUT_NAME_DEBUG", outputNameDebug.c_str());
|
cmSystemTools::ReplaceString(line, "OUTPUT_NAME_DEBUG", outputNameDebug.c_str());
|
||||||
|
@ -1182,6 +1207,12 @@ void cmLocalVisualStudio6Generator
|
||||||
cmSystemTools::ReplaceString(line, "OUTPUT_NAME_RELWITHDEBINFO", outputNameRelWithDebInfo.c_str());
|
cmSystemTools::ReplaceString(line, "OUTPUT_NAME_RELWITHDEBINFO", outputNameRelWithDebInfo.c_str());
|
||||||
cmSystemTools::ReplaceString(line, "OUTPUT_NAME", outputName.c_str());
|
cmSystemTools::ReplaceString(line, "OUTPUT_NAME", outputName.c_str());
|
||||||
|
|
||||||
|
// Substitute the proper link information into the template.
|
||||||
|
cmSystemTools::ReplaceString(line, "CM_MULTILINE_OPTIONS_DEBUG", optionsDebug.c_str());
|
||||||
|
cmSystemTools::ReplaceString(line, "CM_MULTILINE_OPTIONS_RELEASE", optionsRelease.c_str());
|
||||||
|
cmSystemTools::ReplaceString(line, "CM_MULTILINE_OPTIONS_MINSIZEREL", optionsMinSizeRel.c_str());
|
||||||
|
cmSystemTools::ReplaceString(line, "CM_MULTILINE_OPTIONS_RELWITHDEBINFO", optionsRelWithDebInfo.c_str());
|
||||||
|
|
||||||
cmSystemTools::ReplaceString(line, "BUILD_INCLUDES",
|
cmSystemTools::ReplaceString(line, "BUILD_INCLUDES",
|
||||||
this->IncludeOptions.c_str());
|
this->IncludeOptions.c_str());
|
||||||
cmSystemTools::ReplaceString(line, "OUTPUT_LIBNAME",libName);
|
cmSystemTools::ReplaceString(line, "OUTPUT_LIBNAME",libName);
|
||||||
|
@ -1305,3 +1336,50 @@ void cmLocalVisualStudio6Generator::WriteDSPFooter(std::ostream& fout)
|
||||||
fout << line << std::endl;
|
fout << line << std::endl;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//-----------------------------------------------------------------------------
|
||||||
|
void cmLocalVisualStudio6Generator::ComputeLinkOptions(cmTarget& target,
|
||||||
|
const char* configName,
|
||||||
|
const std::string extraOptions,
|
||||||
|
std::string& options)
|
||||||
|
{
|
||||||
|
// Compute the link information for this configuration.
|
||||||
|
std::vector<cmStdString> linkLibs;
|
||||||
|
std::vector<cmStdString> linkDirs;
|
||||||
|
this->ComputeLinkInformation(target, configName, linkLibs, linkDirs);
|
||||||
|
|
||||||
|
// Build the link options code.
|
||||||
|
for(std::vector<cmStdString>::const_iterator d = linkDirs.begin();
|
||||||
|
d != linkDirs.end(); ++d)
|
||||||
|
{
|
||||||
|
std::string dir = *d;
|
||||||
|
if(!dir.empty())
|
||||||
|
{
|
||||||
|
if(dir[dir.size()-1] != '/')
|
||||||
|
{
|
||||||
|
dir += "/";
|
||||||
|
}
|
||||||
|
dir += "$(IntDir)";
|
||||||
|
options += "# ADD LINK32 /LIBPATH:";
|
||||||
|
options += this->ConvertToOptionallyRelativeOutputPath(dir.c_str());
|
||||||
|
options += " /LIBPATH:";
|
||||||
|
options += this->ConvertToOptionallyRelativeOutputPath(d->c_str());
|
||||||
|
options += "\n";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for(std::vector<cmStdString>::const_iterator l = linkLibs.begin();
|
||||||
|
l != linkLibs.end(); ++l)
|
||||||
|
{
|
||||||
|
options += "# ADD LINK32 ";
|
||||||
|
options += this->ConvertToOptionallyRelativeOutputPath(l->c_str());
|
||||||
|
options += "\n";
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add extra options if any.
|
||||||
|
if(!extraOptions.empty())
|
||||||
|
{
|
||||||
|
options += "# ADD LINK32 ";
|
||||||
|
options += extraOptions;
|
||||||
|
options += "\n";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
@ -94,6 +94,9 @@ private:
|
||||||
std::ostream &fout, const char *libName);
|
std::ostream &fout, const char *libName);
|
||||||
std::string CreateTargetRules(cmTarget &target,
|
std::string CreateTargetRules(cmTarget &target,
|
||||||
const char *libName);
|
const char *libName);
|
||||||
|
void ComputeLinkOptions(cmTarget& target, const char* configName,
|
||||||
|
const std::string extraOptions,
|
||||||
|
std::string& options);
|
||||||
std::string IncludeOptions;
|
std::string IncludeOptions;
|
||||||
std::vector<std::string> Configurations;
|
std::vector<std::string> Configurations;
|
||||||
};
|
};
|
||||||
|
|
|
@ -71,7 +71,8 @@ BSC32=bscmake.exe
|
||||||
# ADD BSC32 /nologo
|
# ADD BSC32 /nologo
|
||||||
LINK32=link.exe
|
LINK32=link.exe
|
||||||
# ADD BASE LINK32 /nologo /dll /machine:I386
|
# ADD BASE LINK32 /nologo /dll /machine:I386
|
||||||
# ADD LINK32 CM_OPTIMIZED_LIBRARIES CM_LIBRARIES /nologo /dll /machine:I386 /out:"LIBRARY_OUTPUT_PATHRelease/OUTPUT_NAME_RELEASE"
|
# ADD LINK32 /nologo /dll /machine:I386 /out:"LIBRARY_OUTPUT_PATHRelease/OUTPUT_NAME_RELEASE"
|
||||||
|
CM_MULTILINE_OPTIONS_RELEASE
|
||||||
|
|
||||||
CMAKE_CUSTOM_RULE_CODE
|
CMAKE_CUSTOM_RULE_CODE
|
||||||
|
|
||||||
|
@ -102,9 +103,8 @@ BSC32=bscmake.exe
|
||||||
# ADD BSC32 /nologo
|
# ADD BSC32 /nologo
|
||||||
LINK32=link.exe
|
LINK32=link.exe
|
||||||
# ADD BASE LINK32 /nologo /dll /debug /machine:I386 /pdbtype:sept
|
# ADD BASE LINK32 /nologo /dll /debug /machine:I386 /pdbtype:sept
|
||||||
CM_MULTILINE_DEBUG_LIBRARIES
|
|
||||||
CM_MULTILINE_LIBRARIES_FOR_DEBUG
|
|
||||||
# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"LIBRARY_OUTPUT_PATHDebug/OUTPUT_NAME_DEBUG" /pdbtype:sept
|
# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"LIBRARY_OUTPUT_PATHDebug/OUTPUT_NAME_DEBUG" /pdbtype:sept
|
||||||
|
CM_MULTILINE_OPTIONS_DEBUG
|
||||||
|
|
||||||
CMAKE_CUSTOM_RULE_CODE
|
CMAKE_CUSTOM_RULE_CODE
|
||||||
|
|
||||||
|
@ -137,7 +137,8 @@ BSC32=bscmake.exe
|
||||||
# ADD BSC32 /nologo
|
# ADD BSC32 /nologo
|
||||||
LINK32=link.exe
|
LINK32=link.exe
|
||||||
# ADD BASE LINK32 /nologo /dll /machine:I386
|
# ADD BASE LINK32 /nologo /dll /machine:I386
|
||||||
# ADD LINK32 CM_OPTIMIZED_LIBRARIES CM_LIBRARIES /nologo /dll /machine:I386 /out:"LIBRARY_OUTPUT_PATHMinSizeRel/OUTPUT_NAME_MINSIZEREL"
|
# ADD LINK32 /nologo /dll /machine:I386 /out:"LIBRARY_OUTPUT_PATHMinSizeRel/OUTPUT_NAME_MINSIZEREL"
|
||||||
|
CM_MULTILINE_OPTIONS_MINSIZEREL
|
||||||
|
|
||||||
CMAKE_CUSTOM_RULE_CODE
|
CMAKE_CUSTOM_RULE_CODE
|
||||||
|
|
||||||
|
@ -168,7 +169,8 @@ BSC32=bscmake.exe
|
||||||
# ADD BSC32 /nologo
|
# ADD BSC32 /nologo
|
||||||
LINK32=link.exe
|
LINK32=link.exe
|
||||||
# ADD BASE LINK32 /nologo /dll /machine:I386 /pdbtype:sept
|
# ADD BASE LINK32 /nologo /dll /machine:I386 /pdbtype:sept
|
||||||
# ADD LINK32 CM_OPTIMIZED_LIBRARIES CM_LIBRARIES /nologo /dll /debug /machine:I386 /pdbtype:sept /out:"LIBRARY_OUTPUT_PATHRelWithDebInfo/OUTPUT_NAME_RELWITHDEBINFO"
|
# ADD LINK32 /nologo /dll /debug /machine:I386 /pdbtype:sept /out:"LIBRARY_OUTPUT_PATHRelWithDebInfo/OUTPUT_NAME_RELWITHDEBINFO"
|
||||||
|
CM_MULTILINE_OPTIONS_RELWITHDEBINFO
|
||||||
|
|
||||||
CMAKE_CUSTOM_RULE_CODE
|
CMAKE_CUSTOM_RULE_CODE
|
||||||
|
|
||||||
|
|
|
@ -70,8 +70,7 @@ LINK32=link.exe
|
||||||
# ADD BASE LINK32 /nologo /subsystem:console /machine:I386 /IGNORE:4089
|
# ADD BASE LINK32 /nologo /subsystem:console /machine:I386 /IGNORE:4089
|
||||||
# ADD LINK32 /nologo /subsystem:console /machine:I386 /IGNORE:4089
|
# ADD LINK32 /nologo /subsystem:console /machine:I386 /IGNORE:4089
|
||||||
# ADD LINK32 /out:"EXECUTABLE_OUTPUT_PATHRelease\OUTPUT_NAME_RELEASE"
|
# ADD LINK32 /out:"EXECUTABLE_OUTPUT_PATHRelease\OUTPUT_NAME_RELEASE"
|
||||||
CM_MULTILINE_OPTIMIZED_LIBRARIES
|
CM_MULTILINE_OPTIONS_RELEASE
|
||||||
CM_MULTILINE_LIBRARIES
|
|
||||||
|
|
||||||
CMAKE_CUSTOM_RULE_CODE
|
CMAKE_CUSTOM_RULE_CODE
|
||||||
|
|
||||||
|
@ -103,8 +102,7 @@ LINK32=link.exe
|
||||||
# ADD BASE LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /IGNORE:4089
|
# ADD BASE LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /IGNORE:4089
|
||||||
# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /IGNORE:4089
|
# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /IGNORE:4089
|
||||||
# ADD LINK32 /out:"EXECUTABLE_OUTPUT_PATHDebug\OUTPUT_NAME_DEBUG"
|
# ADD LINK32 /out:"EXECUTABLE_OUTPUT_PATHDebug\OUTPUT_NAME_DEBUG"
|
||||||
CM_MULTILINE_DEBUG_LIBRARIES
|
CM_MULTILINE_OPTIONS_DEBUG
|
||||||
CM_MULTILINE_LIBRARIES_FOR_DEBUG
|
|
||||||
|
|
||||||
CMAKE_CUSTOM_RULE_CODE
|
CMAKE_CUSTOM_RULE_CODE
|
||||||
|
|
||||||
|
@ -133,8 +131,7 @@ LINK32=link.exe
|
||||||
# ADD BASE LINK32 /nologo /subsystem:console /machine:I386 /IGNORE:4089
|
# ADD BASE LINK32 /nologo /subsystem:console /machine:I386 /IGNORE:4089
|
||||||
# ADD LINK32 /nologo /subsystem:console /machine:I386 /IGNORE:4089
|
# ADD LINK32 /nologo /subsystem:console /machine:I386 /IGNORE:4089
|
||||||
# ADD LINK32 /out:"EXECUTABLE_OUTPUT_PATHMinSizeRel\OUTPUT_NAME_MINSIZEREL"
|
# ADD LINK32 /out:"EXECUTABLE_OUTPUT_PATHMinSizeRel\OUTPUT_NAME_MINSIZEREL"
|
||||||
CM_MULTILINE_OPTIMIZED_LIBRARIES
|
CM_MULTILINE_OPTIONS_MINSIZEREL
|
||||||
CM_MULTILINE_LIBRARIES
|
|
||||||
|
|
||||||
CMAKE_CUSTOM_RULE_CODE
|
CMAKE_CUSTOM_RULE_CODE
|
||||||
|
|
||||||
|
@ -164,8 +161,7 @@ LINK32=link.exe
|
||||||
# ADD BASE LINK32 /nologo /subsystem:console /debug /machine:I386 /IGNORE:4089
|
# ADD BASE LINK32 /nologo /subsystem:console /debug /machine:I386 /IGNORE:4089
|
||||||
# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /IGNORE:4089
|
# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /IGNORE:4089
|
||||||
# ADD LINK32 /out:"EXECUTABLE_OUTPUT_PATHRelWithDebInfo\OUTPUT_NAME_RELWITHDEBINFO"
|
# ADD LINK32 /out:"EXECUTABLE_OUTPUT_PATHRelWithDebInfo\OUTPUT_NAME_RELWITHDEBINFO"
|
||||||
CM_MULTILINE_OPTIMIZED_LIBRARIES
|
CM_MULTILINE_OPTIONS_RELWITHDEBINFO
|
||||||
CM_MULTILINE_LIBRARIES
|
|
||||||
|
|
||||||
CMAKE_CUSTOM_RULE_CODE
|
CMAKE_CUSTOM_RULE_CODE
|
||||||
|
|
||||||
|
|
|
@ -72,8 +72,7 @@ LINK32=link.exe
|
||||||
# ADD BASE LINK32 /nologo /subsystem:windows /machine:I386 /IGNORE:4089
|
# ADD BASE LINK32 /nologo /subsystem:windows /machine:I386 /IGNORE:4089
|
||||||
# ADD LINK32 /nologo /subsystem:windows /machine:I386 /IGNORE:4089
|
# ADD LINK32 /nologo /subsystem:windows /machine:I386 /IGNORE:4089
|
||||||
# ADD LINK32 /out:"EXECUTABLE_OUTPUT_PATHRelease\OUTPUT_NAME_RELEASE"
|
# ADD LINK32 /out:"EXECUTABLE_OUTPUT_PATHRelease\OUTPUT_NAME_RELEASE"
|
||||||
CM_MULTILINE_OPTIMIZED_LIBRARIES
|
CM_MULTILINE_OPTIONS_RELEASE
|
||||||
CM_MULTILINE_LIBRARIES
|
|
||||||
|
|
||||||
CMAKE_CUSTOM_RULE_CODE
|
CMAKE_CUSTOM_RULE_CODE
|
||||||
|
|
||||||
|
@ -105,9 +104,7 @@ LINK32=link.exe
|
||||||
# ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept /IGNORE:4089
|
# ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept /IGNORE:4089
|
||||||
# ADD LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept /IGNORE:4089
|
# ADD LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept /IGNORE:4089
|
||||||
# ADD LINK32 /out:"EXECUTABLE_OUTPUT_PATHDebug\OUTPUT_NAME_DEBUG"
|
# ADD LINK32 /out:"EXECUTABLE_OUTPUT_PATHDebug\OUTPUT_NAME_DEBUG"
|
||||||
CM_MULTILINE_DEBUG_LIBRARIES
|
CM_MULTILINE_OPTIONS_DEBUG
|
||||||
CM_MULTILINE_LIBRARIES_FOR_DEBUG
|
|
||||||
|
|
||||||
|
|
||||||
CMAKE_CUSTOM_RULE_CODE
|
CMAKE_CUSTOM_RULE_CODE
|
||||||
|
|
||||||
|
@ -136,8 +133,7 @@ LINK32=link.exe
|
||||||
# ADD BASE LINK32 /nologo /subsystem:windows /machine:I386 /pdbtype:sept /IGNORE:4089
|
# ADD BASE LINK32 /nologo /subsystem:windows /machine:I386 /pdbtype:sept /IGNORE:4089
|
||||||
# ADD LINK32 /nologo /subsystem:windows /machine:I386 /pdbtype:sept /IGNORE:4089
|
# ADD LINK32 /nologo /subsystem:windows /machine:I386 /pdbtype:sept /IGNORE:4089
|
||||||
# ADD LINK32 /out:"EXECUTABLE_OUTPUT_PATHMinSizeRel\OUTPUT_NAME_MINSIZEREL"
|
# ADD LINK32 /out:"EXECUTABLE_OUTPUT_PATHMinSizeRel\OUTPUT_NAME_MINSIZEREL"
|
||||||
CM_MULTILINE_OPTIMIZED_LIBRARIES
|
CM_MULTILINE_OPTIONS_MINSIZEREL
|
||||||
CM_MULTILINE_LIBRARIES
|
|
||||||
|
|
||||||
CMAKE_CUSTOM_RULE_CODE
|
CMAKE_CUSTOM_RULE_CODE
|
||||||
|
|
||||||
|
@ -169,8 +165,7 @@ LINK32=link.exe
|
||||||
# ADD BASE LINK32 /nologo /subsystem:windows /machine:I386 /IGNORE:4089
|
# ADD BASE LINK32 /nologo /subsystem:windows /machine:I386 /IGNORE:4089
|
||||||
# ADD LINK32 /nologo /subsystem:windows /debug /machine:I386 /IGNORE:4089
|
# ADD LINK32 /nologo /subsystem:windows /debug /machine:I386 /IGNORE:4089
|
||||||
# ADD LINK32 /out:"EXECUTABLE_OUTPUT_PATHRelWithDebInfo\OUTPUT_NAME_RELWITHDEBINFO"
|
# ADD LINK32 /out:"EXECUTABLE_OUTPUT_PATHRelWithDebInfo\OUTPUT_NAME_RELWITHDEBINFO"
|
||||||
CM_MULTILINE_OPTIMIZED_LIBRARIES
|
CM_MULTILINE_OPTIONS_RELWITHDEBINFO
|
||||||
CM_MULTILINE_LIBRARIES
|
|
||||||
|
|
||||||
CMAKE_CUSTOM_RULE_CODE
|
CMAKE_CUSTOM_RULE_CODE
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue