[Cmake-commits] CMake branch, master, updated. v3.0.1-1784-gbfc81c5
Brad King
brad.king at kitware.com
Tue Sep 2 10:16:38 EDT 2014
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 bfc81c5934e6cc0ade50e6ed461e211d55757765 (commit)
via 39fefde25d49b92d8b03eaf13c1b39478e053140 (commit)
via 89da84657a250b1a1510f49180abc886148facd0 (commit)
via ed7f085f968d9508f247fea4550c3a413ade02c7 (commit)
via dd11ae8f0f72562f4cb0fabdf8b798cd75d36f41 (commit)
via b8e405387eca702d93a88eb55842a65de7792cf5 (commit)
via 0432f0620d58997cd80fd5283af3afc510482d2c (commit)
via e6ff2f8bb4308b055b1f6b193b9cabb9f45c65ae (commit)
via ee48f4c7ae2c63fc565b1c112f887965b7c3b248 (commit)
via cb1aceed8ceb29d5f01f6444133060e603297fec (commit)
via 401269e43b49ce25e247efb1fa3503b32eafa411 (commit)
via 23782171ad900dc6eac6a4b8fa4e44f96ffb94bf (commit)
via bc373c6d321bee84aa8c4c4bf87c8b2d41b763c4 (commit)
via d89b28893dda8fb299e91795aba320b6b519cfd9 (commit)
via 03ad8f28c88dbd04c41c7f6b7cc96740e8a486a4 (commit)
from 7a4a05d076cdab6d5803627aca97e94180481c4f (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=bfc81c5934e6cc0ade50e6ed461e211d55757765
commit bfc81c5934e6cc0ade50e6ed461e211d55757765
Merge: 7a4a05d 39fefde
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Sep 2 10:16:37 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Sep 2 10:16:37 2014 -0400
Merge topic 'vs-windows-apps'
39fefde2 VS: Add test case for Windows Phone and Windows Store
89da8465 MSVC: Define 'WIN32' for Windows Store and Windows Phone
ed7f085f Help: Add notes for topic 'vs-windows-apps'
dd11ae8f VS: Do not compile C sources as WinRT (#15100)
b8e40538 VS: Mark Windows Phone and Store targets as App Containers
0432f062 VS: Always ignore ole32 on Windows Phone 8.0
e6ff2f8b VS: Generate Windows Metadata for WinRT components
ee48f4c7 VS: Generate Windows Phone and Windows Store projects as Unicode
cb1aceed VS: Add VS_WINRT_COMPONENT property to enable CompileAsWinRT
401269e4 VS: Handle .pfx files explicitly in generator
23782171 VS: Handle AppxManifest sources explicitly in generator
bc373c6d VS: Set Window Phone/Store app type in CMake-generated targets
d89b2889 VS: Mark CMake-generated targets as Utility in .vcxproj files
03ad8f28 CMakeDetermineCompilerABI: Link with standard libraries on MSVC
diff --cc Source/cmVisualStudio10TargetGenerator.cxx
index 09a9252,c00d400..c525b7c
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@@ -1399,12 -1462,11 +1488,16 @@@ bool cmVisualStudio10TargetGenerator::O
{
clOptions.AddFlag("CompileAs", compileAs);
}
+ if(noWinRT)
+ {
+ clOptions.AddFlag("CompileAsWinRT", "false");
+ }
clOptions.Parse(flags.c_str());
+ if(clOptions.HasFlag("AdditionalIncludeDirectories"))
+ {
+ clOptions.AppendFlag("AdditionalIncludeDirectories",
+ "%(AdditionalIncludeDirectories)");
+ }
clOptions.AddDefines(configDefines.c_str());
clOptions.SetConfiguration((*config).c_str());
clOptions.OutputAdditionalOptions(*this->BuildFileStream, " ", "");
-----------------------------------------------------------------------
Summary of changes:
.gitattributes | 2 +
Help/manual/cmake-properties.7.rst | 1 +
Help/prop_tgt/VS_WINRT_COMPONENT.rst | 11 +
Help/prop_tgt/VS_WINRT_EXTENSIONS.rst | 5 +-
Help/release/dev/vs-windows-apps.rst | 6 +
Modules/CMakeDetermineCompilerABI.cmake | 12 +-
Modules/Platform/Windows-MSVC.cmake | 1 +
Source/cmGeneratorTarget.cxx | 28 +
Source/cmGeneratorTarget.h | 4 +
Source/cmVisualStudio10TargetGenerator.cxx | 663 +++++++++++++++++++-
Source/cmVisualStudio10TargetGenerator.h | 13 +
Source/cmVisualStudioGeneratorOptions.cxx | 6 +
Source/cmVisualStudioGeneratorOptions.h | 1 +
Templates/Windows/ApplicationIcon.png | Bin 0 -> 3392 bytes
Templates/Windows/Logo.png | Bin 0 -> 801 bytes
Templates/Windows/SmallLogo.png | Bin 0 -> 329 bytes
Templates/Windows/SplashScreen.png | Bin 0 -> 2146 bytes
Templates/Windows/StoreLogo.png | Bin 0 -> 429 bytes
Templates/Windows/Windows_TemporaryKey.pfx | Bin 0 -> 2560 bytes
Tests/CMakeLists.txt | 50 ++
Tests/VSWinStorePhone/CMakeLists.txt | 114 ++++
.../Direct3DApp1/Assets/ApplicationIcon.png | Bin 0 -> 3392 bytes
Tests/VSWinStorePhone/Direct3DApp1/Assets/Logo.png | Bin 0 -> 801 bytes
.../Direct3DApp1/Assets/SmallLogo.png | Bin 0 -> 329 bytes
.../Direct3DApp1/Assets/SplashScreen.png | Bin 0 -> 2146 bytes
.../Direct3DApp1/Assets/StoreLogo.png | Bin 0 -> 429 bytes
.../Assets/Tiles/FlipCycleTileLarge.png | Bin 0 -> 9930 bytes
.../Assets/Tiles/FlipCycleTileMedium.png | Bin 0 -> 9070 bytes
.../Assets/Tiles/FlipCycleTileSmall.png | Bin 0 -> 3674 bytes
.../Assets/Tiles/IconicTileMediumLarge.png | Bin 0 -> 4937 bytes
.../Direct3DApp1/Assets/Tiles/IconicTileSmall.png | Bin 0 -> 3724 bytes
Tests/VSWinStorePhone/Direct3DApp1/BasicTimer.h | 76 +++
.../VSWinStorePhone/Direct3DApp1/CubeRenderer.cpp | 260 ++++++++
Tests/VSWinStorePhone/Direct3DApp1/CubeRenderer.h | 44 ++
.../VSWinStorePhone/Direct3DApp1/Direct3DApp1.cpp | 153 +++++
Tests/VSWinStorePhone/Direct3DApp1/Direct3DApp1.h | 40 ++
.../Direct3DApp1/Direct3DApp1_TemporaryKey.pfx | Bin 0 -> 2560 bytes
.../VSWinStorePhone/Direct3DApp1/Direct3DBase.cpp | 384 ++++++++++++
Tests/VSWinStorePhone/Direct3DApp1/Direct3DBase.h | 39 ++
Tests/VSWinStorePhone/Direct3DApp1/DirectXHelper.h | 45 ++
.../Direct3DApp1/SimplePixelShader.cso | Bin 0 -> 12796 bytes
.../Direct3DApp1/SimplePixelShader.hlsl | 10 +
.../Direct3DApp1/SimpleVertexShader.cso | Bin 0 -> 16336 bytes
.../Direct3DApp1/SimpleVertexShader.hlsl | 35 ++
Tests/VSWinStorePhone/Direct3DApp1/pch.cpp | 1 +
Tests/VSWinStorePhone/Direct3DApp1/pch.h | 7 +
.../cmake/Package_vc11.store.appxmanifest.in | 24 +
.../cmake/Package_vc11.wp.appxmanifest.in | 35 ++
.../cmake/Package_vc12.store.appxmanifest.in | 34 +
.../cmake/Package_vc12.wp.appxmanifest.in | 36 ++
50 files changed, 2121 insertions(+), 19 deletions(-)
create mode 100644 Help/prop_tgt/VS_WINRT_COMPONENT.rst
create mode 100644 Help/release/dev/vs-windows-apps.rst
create mode 100644 Templates/Windows/ApplicationIcon.png
create mode 100644 Templates/Windows/Logo.png
create mode 100644 Templates/Windows/SmallLogo.png
create mode 100644 Templates/Windows/SplashScreen.png
create mode 100644 Templates/Windows/StoreLogo.png
create mode 100644 Templates/Windows/Windows_TemporaryKey.pfx
create mode 100644 Tests/VSWinStorePhone/CMakeLists.txt
create mode 100644 Tests/VSWinStorePhone/Direct3DApp1/Assets/ApplicationIcon.png
create mode 100644 Tests/VSWinStorePhone/Direct3DApp1/Assets/Logo.png
create mode 100644 Tests/VSWinStorePhone/Direct3DApp1/Assets/SmallLogo.png
create mode 100644 Tests/VSWinStorePhone/Direct3DApp1/Assets/SplashScreen.png
create mode 100644 Tests/VSWinStorePhone/Direct3DApp1/Assets/StoreLogo.png
create mode 100644 Tests/VSWinStorePhone/Direct3DApp1/Assets/Tiles/FlipCycleTileLarge.png
create mode 100644 Tests/VSWinStorePhone/Direct3DApp1/Assets/Tiles/FlipCycleTileMedium.png
create mode 100644 Tests/VSWinStorePhone/Direct3DApp1/Assets/Tiles/FlipCycleTileSmall.png
create mode 100644 Tests/VSWinStorePhone/Direct3DApp1/Assets/Tiles/IconicTileMediumLarge.png
create mode 100644 Tests/VSWinStorePhone/Direct3DApp1/Assets/Tiles/IconicTileSmall.png
create mode 100644 Tests/VSWinStorePhone/Direct3DApp1/BasicTimer.h
create mode 100644 Tests/VSWinStorePhone/Direct3DApp1/CubeRenderer.cpp
create mode 100644 Tests/VSWinStorePhone/Direct3DApp1/CubeRenderer.h
create mode 100644 Tests/VSWinStorePhone/Direct3DApp1/Direct3DApp1.cpp
create mode 100644 Tests/VSWinStorePhone/Direct3DApp1/Direct3DApp1.h
create mode 100644 Tests/VSWinStorePhone/Direct3DApp1/Direct3DApp1_TemporaryKey.pfx
create mode 100644 Tests/VSWinStorePhone/Direct3DApp1/Direct3DBase.cpp
create mode 100644 Tests/VSWinStorePhone/Direct3DApp1/Direct3DBase.h
create mode 100644 Tests/VSWinStorePhone/Direct3DApp1/DirectXHelper.h
create mode 100644 Tests/VSWinStorePhone/Direct3DApp1/SimplePixelShader.cso
create mode 100644 Tests/VSWinStorePhone/Direct3DApp1/SimplePixelShader.hlsl
create mode 100644 Tests/VSWinStorePhone/Direct3DApp1/SimpleVertexShader.cso
create mode 100644 Tests/VSWinStorePhone/Direct3DApp1/SimpleVertexShader.hlsl
create mode 100644 Tests/VSWinStorePhone/Direct3DApp1/pch.cpp
create mode 100644 Tests/VSWinStorePhone/Direct3DApp1/pch.h
create mode 100644 Tests/VSWinStorePhone/cmake/Package_vc11.store.appxmanifest.in
create mode 100644 Tests/VSWinStorePhone/cmake/Package_vc11.wp.appxmanifest.in
create mode 100644 Tests/VSWinStorePhone/cmake/Package_vc12.store.appxmanifest.in
create mode 100644 Tests/VSWinStorePhone/cmake/Package_vc12.wp.appxmanifest.in
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list