[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3543-g8fcf9ac

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  8fcf9ac319a174bb427de84f1d9188e07bb773f4 (commit)
       via  b64e8f22a4f08972e2d4b2bd5bd338247ec0946c (commit)
      from  29960ae9781614a8f171d5786fcb8e2b7a009004 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8fcf9ac319a174bb427de84f1d9188e07bb773f4
commit 8fcf9ac319a174bb427de84f1d9188e07bb773f4
Merge: 29960ae b64e8f2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 31 10:22:10 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jul 31 10:22:10 2013 -0400

    Merge topic 'vs-subsystem-order' into next
    
    b64e8f2 VS10: Honor user-specified /SUBSYSTEM: flag (#14326)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b64e8f22a4f08972e2d4b2bd5bd338247ec0946c
commit b64e8f22a4f08972e2d4b2bd5bd338247ec0946c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 31 10:14:33 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jul 31 10:17:17 2013 -0400

    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.

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;

-----------------------------------------------------------------------

Summary of changes:
 Source/cmVisualStudio10TargetGenerator.cxx |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake