[Cmake-commits] CMake branch, next, updated. v3.0.2-5450-gd32009a

[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  d32009a23a164d10e49b8f3e9508ec7c60b3fe88 (commit)
       via  1167882a4b9123096908be38027e2cb261f581c7 (commit)
       via  9a6afc89c14c29344245f38be977aae9591068d7 (commit)
       via  aa0a67bf788c787cc917334192b0c1d59decc653 (commit)
      from  2f91e810f7defe668176c9e57971e16ffc610f6e (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=d32009a23a164d10e49b8f3e9508ec7c60b3fe88
commit d32009a23a164d10e49b8f3e9508ec7c60b3fe88
Merge: 2f91e81 1167882
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 24 14:32:57 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Sep 24 14:32:57 2014 -0400

    Merge topic 'vs-nsight-tegra-generator' into next
    
    1167882a VS: Map Nsight Tegra file types in .vcxproj files
    9a6afc89 VS: Use case-insensitive check for hlsl,jpg,png,xml file extensions
    aa0a67bf cmVisualStudio10TargetGenerator: Remove unused parameter name


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1167882a4b9123096908be38027e2cb261f581c7
commit 1167882a4b9123096908be38027e2cb261f581c7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 24 14:27:18 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Sep 24 14:27:18 2014 -0400

    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.

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 4e953ad..b5b99d8 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -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() ||

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9a6afc89c14c29344245f38be977aae9591068d7
commit 9a6afc89c14c29344245f38be977aae9591068d7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 24 14:25:35 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Sep 24 14:25:35 2014 -0400

    VS: Use case-insensitive check for hlsl,jpg,png,xml file extensions
    
    These "extra" sources should map to the proper tool even when they
    are not in lower case.

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 1c5412b..4e953ad 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -1180,7 +1180,7 @@ void cmVisualStudio10TargetGenerator::WriteExtraSource(cmSourceFile const* sf)
   bool toolHasSettings = false;
   std::string tool = "None";
   std::string shaderType;
-  std::string const& ext = sf->GetExtension();
+  std::string ext = cmSystemTools::LowerCase(sf->GetExtension());
   if(ext == "hlsl")
     {
     tool = "FXCompile";

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aa0a67bf788c787cc917334192b0c1d59decc653
commit aa0a67bf788c787cc917334192b0c1d59decc653
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 24 13:48:15 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Sep 24 13:48:15 2014 -0400

    cmVisualStudio10TargetGenerator: Remove unused parameter name

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 69b0848..1c5412b 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -2019,7 +2019,7 @@ cmVisualStudio10TargetGenerator::WriteLibOptions(std::string const& config)
 
 //----------------------------------------------------------------------------
 void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
-  std::string const& config)
+  std::string const&)
 {
   // Look through the sources for AndroidManifest.xml and use
   // its location as the root source directory.

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

Summary of changes:
 Source/cmVisualStudio10TargetGenerator.cxx |   26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake