diff options
| author | Brad King <brad.king@kitware.com> | 2013-08-01 12:53:21 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-08-01 12:53:21 (GMT) |
| commit | 75af0cbfe7c62cd73ae6eb25b06eb0f7d8566007 (patch) | |
| tree | 95909cf47a6c75b00233ae6440f20f813657e2bc | |
| parent | a26e7d0782dbe0cd2e7958419212e534439245c9 (diff) | |
| parent | b64e8f22a4f08972e2d4b2bd5bd338247ec0946c (diff) | |
| download | CMake-75af0cbfe7c62cd73ae6eb25b06eb0f7d8566007.zip CMake-75af0cbfe7c62cd73ae6eb25b06eb0f7d8566007.tar.gz CMake-75af0cbfe7c62cd73ae6eb25b06eb0f7d8566007.tar.bz2 | |
Merge topic 'vs-subsystem-order'
b64e8f2 VS10: Honor user-specified /SUBSYSTEM: flag (#14326)
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index da5696a..1130704 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -1520,11 +1520,11 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config) } if ( this->Target->GetPropertyAsBool("WIN32_EXECUTABLE") ) { - flags += " /SUBSYSTEM:WINDOWS"; + linkOptions.AddFlag("SubSystem", "Windows"); } else { - flags += " /SUBSYSTEM:CONSOLE"; + linkOptions.AddFlag("SubSystem", "Console"); } std::string standardLibsVar = "CMAKE_"; standardLibsVar += linkLanguage; |