summaryrefslogtreecommitdiffstats
path: root/Source/cmVisualStudio10TargetGenerator.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2013-07-31 14:14:33 (GMT)
committerBrad King <brad.king@kitware.com>2013-07-31 14:17:17 (GMT)
commitb64e8f22a4f08972e2d4b2bd5bd338247ec0946c (patch)
treecc758f7d2186da21b378450c3fed8d571d6d40bf /Source/cmVisualStudio10TargetGenerator.cxx
parent0cecc7b485774be084a6d5a72e743ed9893daa5d (diff)
downloadCMake-b64e8f22a4f08972e2d4b2bd5bd338247ec0946c.zip
CMake-b64e8f22a4f08972e2d4b2bd5bd338247ec0946c.tar.gz
CMake-b64e8f22a4f08972e2d4b2bd5bd338247ec0946c.tar.bz2
VS10: Honor user-specified /SUBSYSTEM: flag (#14326)
Use the WIN32_EXECUTABLE target property only to set the SubSystem build attribute default. When user-specified flags are later parsed they may then override it.
Diffstat (limited to 'Source/cmVisualStudio10TargetGenerator.cxx')
-rw-r--r--Source/cmVisualStudio10TargetGenerator.cxx4
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;