Merge topic 'vs-subsystem-order'
b64e8f2
VS10: Honor user-specified /SUBSYSTEM: flag (#14326)
This commit is contained in:
commit
75af0cbfe7
|
@ -1520,11 +1520,11 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
|
||||||
}
|
}
|
||||||
if ( this->Target->GetPropertyAsBool("WIN32_EXECUTABLE") )
|
if ( this->Target->GetPropertyAsBool("WIN32_EXECUTABLE") )
|
||||||
{
|
{
|
||||||
flags += " /SUBSYSTEM:WINDOWS";
|
linkOptions.AddFlag("SubSystem", "Windows");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
flags += " /SUBSYSTEM:CONSOLE";
|
linkOptions.AddFlag("SubSystem", "Console");
|
||||||
}
|
}
|
||||||
std::string standardLibsVar = "CMAKE_";
|
std::string standardLibsVar = "CMAKE_";
|
||||||
standardLibsVar += linkLanguage;
|
standardLibsVar += linkLanguage;
|
||||||
|
|
Loading…
Reference in New Issue