[Cmake-commits] CMake branch, next, updated. v3.3.2-3482-gd5aff18

[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  d5aff18791bb13788726569d3dc10efe826f721f (commit)
       via  4c690ddcdc0ade5b807f56d50c5a175fd3ad78fd (commit)
       via  a8319493eb92dc849eeffc16dda9e16a44cea020 (commit)
      from  8989d268cfea91747d054a4820054ddd26af864e (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d5aff18791bb13788726569d3dc10efe826f721f
commit d5aff18791bb13788726569d3dc10efe826f721f
Merge: 8989d26 4c690dd
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 5 09:45:27 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 5 09:45:27 2015 -0400

    Merge topic 'vs-win10-store' into next
    
    4c690ddc fixup! This change adds support for Windows 10 Universal (Store) Applications.
    a8319493 Help: Document Windows 10 Universal Applications in cmake-toolchains(7)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4c690ddcdc0ade5b807f56d50c5a175fd3ad78fd
commit 4c690ddcdc0ade5b807f56d50c5a175fd3ad78fd
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 5 09:44:56 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 5 09:44:56 2015 -0400

    fixup! This change adds support for Windows 10 Universal (Store) Applications.

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 491addc..d1ef6c2 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -2928,23 +2928,23 @@ void cmVisualStudio10TargetGenerator::WriteSinglePlatformExtension(
   std::string const& version
   )
 {
-      this->WriteString("<Import Project=", 2);
-      (*this->BuildFileStream)
-        << "\"$([Microsoft.Build.Utilities.ToolLocationHelper]"
-        << "::GetPlatformExtensionSDKLocation(`"
-        << extension <<", Version=" << version
-        << "`, $(TargetPlatformIdentifier), $(TargetPlatformVersion), null, "
-        << "$(ExtensionSDKDirectoryRoot), null))"
-        << "\\DesignTime\\CommonConfiguration\\Neutral\\"
-        << extension << ".props\" "
-        << "Condition=\"exists('$("
-        << "[Microsoft.Build.Utilities.ToolLocationHelper]"
-        << "::GetPlatformExtensionSDKLocation(`"
-        << extension << ", Version=" << version
-        << "`, $(TargetPlatformIdentifier), $(TargetPlatformVersion), null, "
-        << "$(ExtensionSDKDirectoryRoot), null))"
-        << "\\DesignTime\\CommonConfiguration\\Neutral\\"
-        << extension << ".props')\" />\n";
+  this->WriteString("<Import Project=", 2);
+  (*this->BuildFileStream)
+    << "\"$([Microsoft.Build.Utilities.ToolLocationHelper]"
+    << "::GetPlatformExtensionSDKLocation(`"
+    << extension <<", Version=" << version
+    << "`, $(TargetPlatformIdentifier), $(TargetPlatformVersion), null, "
+    << "$(ExtensionSDKDirectoryRoot), null))"
+    << "\\DesignTime\\CommonConfiguration\\Neutral\\"
+    << extension << ".props\" "
+    << "Condition=\"exists('$("
+    << "[Microsoft.Build.Utilities.ToolLocationHelper]"
+    << "::GetPlatformExtensionSDKLocation(`"
+    << extension << ", Version=" << version
+    << "`, $(TargetPlatformIdentifier), $(TargetPlatformVersion), null, "
+    << "$(ExtensionSDKDirectoryRoot), null))"
+    << "\\DesignTime\\CommonConfiguration\\Neutral\\"
+    << extension << ".props')\" />\n";
 }
 
 void cmVisualStudio10TargetGenerator::WriteSDKReferences()

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a8319493eb92dc849eeffc16dda9e16a44cea020
commit a8319493eb92dc849eeffc16dda9e16a44cea020
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 5 09:41:49 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 5 09:44:34 2015 -0400

    Help: Document Windows 10 Universal Applications in cmake-toolchains(7)

diff --git a/Help/manual/cmake-toolchains.7.rst b/Help/manual/cmake-toolchains.7.rst
index a06dce7..492fcac 100644
--- a/Help/manual/cmake-toolchains.7.rst
+++ b/Help/manual/cmake-toolchains.7.rst
@@ -220,6 +220,23 @@ Windows CE to use.  Currently version 8.0 (Windows Embedded Compact 2013) is
 supported out of the box.  Other versions may require one to set
 :variable:`CMAKE_GENERATOR_TOOLSET` to the correct value.
 
+Cross Compiling for Windows 10 Universal Applications
+-----------------------------------------------------
+
+A toolchain file to configure a Visual Studio generator for a
+Windows 10 Universal Application may look like this:
+
+.. code-block:: cmake
+
+  set(CMAKE_SYSTEM_NAME WindowsStore)
+  set(CMAKE_SYSTEM_VERSION 10.0)
+
+A Windows 10 Universal Application targets both Windows Store and
+Windows Phone.  Specify the :variable:`CMAKE_SYSTEM_VERSION` variable
+to be ``10.0`` to build with the latest available Windows 10 SDK.
+Specify a more specific version (e.g. ``10.0.10240.0`` for RTM)
+to build with the corresponding SDK.
+
 Cross Compiling for Windows Phone
 ---------------------------------
 

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

Summary of changes:
 Help/manual/cmake-toolchains.7.rst         |   17 ++++++++++++++
 Source/cmVisualStudio10TargetGenerator.cxx |   34 ++++++++++++++--------------
 2 files changed, 34 insertions(+), 17 deletions(-)


hooks/post-receive
-- 
CMake