summaryrefslogtreecommitdiffstats
path: root/Source/cmVisualStudio10TargetGenerator.cxx
diff options
context:
space:
mode:
authorGilles Khouzam <gillesk@microsoft.com>2014-08-11 18:08:49 (GMT)
committerBrad King <brad.king@kitware.com>2014-08-21 13:28:20 (GMT)
commit23782171ad900dc6eac6a4b8fa4e44f96ffb94bf (patch)
tree0edebe3fb479b024dcf6e174b54ca11b3a15ab38 /Source/cmVisualStudio10TargetGenerator.cxx
parentbc373c6d321bee84aa8c4c4bf87c8b2d41b763c4 (diff)
downloadCMake-23782171ad900dc6eac6a4b8fa4e44f96ffb94bf.zip
CMake-23782171ad900dc6eac6a4b8fa4e44f96ffb94bf.tar.gz
CMake-23782171ad900dc6eac6a4b8fa4e44f96ffb94bf.tar.bz2
VS: Handle AppxManifest sources explicitly in generator
Teach cmGeneratorTarget to extract .appxmanifest sources separately. Teach cmVisualStudio10TargetGenerator to write them with the AppxManifest tool in .vcxproj files. This will allow us to detect whether the project provides an application manfiest explicitly.
Diffstat (limited to 'Source/cmVisualStudio10TargetGenerator.cxx')
-rw-r--r--Source/cmVisualStudio10TargetGenerator.cxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 4927d6b..3b7f981 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -1022,11 +1022,7 @@ void cmVisualStudio10TargetGenerator::WriteExtraSource(cmSourceFile const* sf)
std::string tool = "None";
std::string shaderType;
std::string const& ext = sf->GetExtension();
- if(ext == "appxmanifest")
- {
- tool = "AppxManifest";
- }
- else if(ext == "hlsl")
+ if(ext == "hlsl")
{
tool = "FXCompile";
// Figure out the type of shader compiler to use.
@@ -1221,6 +1217,10 @@ void cmVisualStudio10TargetGenerator::WriteAllSources()
}
}
+ std::vector<cmSourceFile const*> manifestSources;
+ this->GeneratorTarget->GetAppManifest(manifestSources, "");
+ this->WriteSources("AppxManifest", manifestSources);
+
std::vector<cmSourceFile const*> externalObjects;
this->GeneratorTarget->GetExternalObjects(externalObjects, "");
for(std::vector<cmSourceFile const*>::iterator