[Cmake-commits] CMake branch, master, updated. v3.2.1-610-g9ed24fb
Brad King
brad.king at kitware.com
Fri Apr 3 13:59:04 EDT 2015
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, master has been updated
via 9ed24fbb5e37c7c4338d2117d66f7262fbc5e074 (commit)
via 01a9ab0def07ecddbc1bdfa67fec1bd3e6d030ea (commit)
from b6b77bb750f30c452053ad4c28e4c69b1e7950e0 (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=9ed24fbb5e37c7c4338d2117d66f7262fbc5e074
commit 9ed24fbb5e37c7c4338d2117d66f7262fbc5e074
Merge: b6b77bb 01a9ab0
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Apr 3 13:59:03 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Apr 3 13:59:03 2015 -0400
Merge topic 'vs-xaml'
01a9ab0d VS: Add support for XAML source files
-----------------------------------------------------------------------
Summary of changes:
Help/manual/cmake-properties.7.rst | 1 +
Help/prop_sf/VS_XAML_TYPE.rst | 6 +
Help/release/dev/vs-xaml.rst | 6 +
Source/cmGeneratorTarget.cxx | 49 ++++++++
Source/cmGeneratorTarget.h | 13 ++
Source/cmVisualStudio10TargetGenerator.cxx | 80 ++++++++++++-
Source/cmVisualStudio10TargetGenerator.h | 3 +
Tests/CMakeLists.txt | 11 ++
Tests/VSWindowsFormsResx/CMakeLists.txt | 2 +-
Tests/VSXaml/App.xaml | 7 ++
Tests/VSXaml/App.xaml.cpp | 125 ++++++++++++++++++++
Tests/VSXaml/App.xaml.h | 27 +++++
.../VSXaml/Assets/Logo.scale-100.png | Bin 801 -> 801 bytes
.../VSXaml/Assets/SmallLogo.scale-100.png | Bin 329 -> 329 bytes
.../VSXaml/Assets/SplashScreen.scale-100.png | Bin 2146 -> 2146 bytes
.../VSXaml/Assets/StoreLogo.scale-100.png | Bin 429 -> 429 bytes
Tests/VSXaml/CMakeLists.txt | 52 ++++++++
Tests/VSXaml/MainPage.xaml | 14 +++
Tests/VSXaml/MainPage.xaml.cpp | 27 +++++
Tests/VSXaml/MainPage.xaml.h | 21 ++++
Tests/VSXaml/Package.appxmanifest | 41 +++++++
.../VSXaml/VSXaml_TemporaryKey.pfx | Bin 2560 -> 2560 bytes
Tests/VSXaml/pch.cpp | 6 +
Tests/VSXaml/pch.h | 11 ++
24 files changed, 498 insertions(+), 4 deletions(-)
create mode 100644 Help/prop_sf/VS_XAML_TYPE.rst
create mode 100644 Help/release/dev/vs-xaml.rst
create mode 100644 Tests/VSXaml/App.xaml
create mode 100644 Tests/VSXaml/App.xaml.cpp
create mode 100644 Tests/VSXaml/App.xaml.h
copy Templates/Windows/Logo.png => Tests/VSXaml/Assets/Logo.scale-100.png (100%)
copy Templates/Windows/SmallLogo.png => Tests/VSXaml/Assets/SmallLogo.scale-100.png (100%)
copy Templates/Windows/SplashScreen.png => Tests/VSXaml/Assets/SplashScreen.scale-100.png (100%)
copy Templates/Windows/StoreLogo.png => Tests/VSXaml/Assets/StoreLogo.scale-100.png (100%)
create mode 100644 Tests/VSXaml/CMakeLists.txt
create mode 100644 Tests/VSXaml/MainPage.xaml
create mode 100644 Tests/VSXaml/MainPage.xaml.cpp
create mode 100644 Tests/VSXaml/MainPage.xaml.h
create mode 100644 Tests/VSXaml/Package.appxmanifest
copy Templates/Windows/Windows_TemporaryKey.pfx => Tests/VSXaml/VSXaml_TemporaryKey.pfx (100%)
create mode 100644 Tests/VSXaml/pch.cpp
create mode 100644 Tests/VSXaml/pch.h
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list