[Cmake-commits] CMake branch, next, updated. v3.1.1-2473-g8a0fca5

[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  8a0fca5f026b7c0a42564cc666a182784890b807 (commit)
       via  500794b0db3d7dfa121069f336b69923839bada1 (commit)
       via  4c5574a15d6458673c410622e501ba682a783781 (commit)
      from  9eaeba8f0bcff213de7a42eebe1c9a46ffe78e65 (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=8a0fca5f026b7c0a42564cc666a182784890b807
commit 8a0fca5f026b7c0a42564cc666a182784890b807
Merge: 9eaeba8 500794b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 29 14:56:33 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 29 14:56:33 2015 -0500

    Merge topic 'vs-windows-store-default-language' into next
    
    500794b0 VS: Set default language in generated Windows Phone and Store projects
    4c5574a1 VS: Add missing newlines to .vcxproj generation


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=500794b0db3d7dfa121069f336b69923839bada1
commit 500794b0db3d7dfa121069f336b69923839bada1
Author:     Robert Goulet <robert.goulet at autodesk.com>
AuthorDate: Thu Jan 29 13:38:52 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jan 29 14:30:29 2015 -0500

    VS: Set default language in generated Windows Phone and Store projects
    
    Otherwise building such projects gives:
    
     warning APPX1901: The DefaultLanguage property is either missing from
                       the project file or does not have a value

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index d6b87b8..a286049 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -2762,6 +2762,8 @@ void cmVisualStudio10TargetGenerator::WriteApplicationTypeSettings()
     this->WriteString("<ApplicationTypeRevision>", 2);
     (*this->BuildFileStream) << cmVS10EscapeXML(v)
                              << "</ApplicationTypeRevision>\n";
+    this->WriteString("<DefaultLanguage>en-US"
+                      "</DefaultLanguage>\n", 2);
     if(v == "8.1")
       {
       // Visual Studio 12.0 is necessary for building 8.1 apps

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4c5574a15d6458673c410622e501ba682a783781
commit 4c5574a15d6458673c410622e501ba682a783781
Author:     Robert Goulet <robert.goulet at autodesk.com>
AuthorDate: Thu Jan 29 13:38:46 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jan 29 14:29:01 2015 -0500

    VS: Add missing newlines to .vcxproj generation

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index d2f6ffd..d6b87b8 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -2796,12 +2796,12 @@ void cmVisualStudio10TargetGenerator::WriteApplicationTypeSettings()
   if(isAppContainer)
     {
     this->WriteString("<AppContainerApplication>true"
-                      "</AppContainerApplication>", 2);
+                      "</AppContainerApplication>\n", 2);
     }
   else if (this->Platform == "ARM")
     {
     this->WriteString("<WindowsSDKDesktopARMSupport>true"
-                      "</WindowsSDKDesktopARMSupport>", 2);
+                      "</WindowsSDKDesktopARMSupport>\n", 2);
     }
 }
 

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

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


hooks/post-receive
-- 
CMake