Merge topic 'vs-subsystem-order'

b64e8f2 VS10: Honor user-specified /SUBSYSTEM: flag (#14326)
This commit is contained in:
Brad King 2013-08-01 08:53:21 -04:00 committed by CMake Topic Stage
commit 75af0cbfe7
1 changed files with 2 additions and 2 deletions

View File

@ -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;