summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-09-24 18:27:18 (GMT)
committerBrad King <brad.king@kitware.com>2014-09-30 12:45:35 (GMT)
commit5365c9ac377ab6f579a1af32c4bfbec798417efb (patch)
tree4c47f715af7e5c6150769eb9abca4a703cc44f77 /Source
parent178f56a57996651a4f8c2a20271f1e2c999279d2 (diff)
downloadCMake-5365c9ac377ab6f579a1af32c4bfbec798417efb.zip
CMake-5365c9ac377ab6f579a1af32c4bfbec798417efb.tar.gz
CMake-5365c9ac377ab6f579a1af32c4bfbec798417efb.tar.bz2
VS: Map Nsight Tegra file types in .vcxproj files
Map ".java" to JCompile, ".asm" and ".s" to ClCompile, and a few Android-specific source file names to AndroidBuild. This allows Nsight Tegra 1.6 and above to check up-to-dateness of such sources. Bump NsightTegraProjectRevisionNumber to 7 to allow these fields.
Diffstat (limited to 'Source')
-rw-r--r--Source/cmVisualStudio10TargetGenerator.cxx24
1 files changed, 23 insertions, 1 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index b0c84e3..b42bf90 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -317,7 +317,7 @@ void cmVisualStudio10TargetGenerator::Generate()
{
this->WriteString("<PropertyGroup Label=\"NsightTegraProject\">\n", 1);
this->WriteString("<NsightTegraProjectRevisionNumber>"
- "6"
+ "7"
"</NsightTegraProjectRevisionNumber>\n", 2);
this->WriteString("</PropertyGroup>\n", 1);
}
@@ -1200,6 +1200,28 @@ void cmVisualStudio10TargetGenerator::WriteExtraSource(cmSourceFile const* sf)
{
tool = "XML";
}
+ if(this->NsightTegra)
+ {
+ // Nsight Tegra needs specific file types to check up-to-dateness.
+ std::string name =
+ cmSystemTools::LowerCase(sf->GetLocation().GetName());
+ if(name == "androidmanifest.xml" ||
+ name == "build.xml" ||
+ name == "proguard.cfg" ||
+ name == "proguard-project.txt" ||
+ ext == "properties")
+ {
+ tool = "AndroidBuild";
+ }
+ else if(ext == "java")
+ {
+ tool = "JCompile";
+ }
+ else if(ext == "asm" || ext == "s")
+ {
+ tool = "ClCompile";
+ }
+ }
std::string deployContent;
if(this->GlobalGenerator->TargetsWindowsPhone() ||