[Cmake-commits] CMake branch, next, updated. v3.1.0-rc2-587-g2750b1a

[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  2750b1a94cbf38b4fe17b154bd9ec879108c6288 (commit)
       via  bb3c87f1da7047419d4f81979ce0daf71818b8d6 (commit)
      from  4dac9953188a771eae2f23c0bda041cf1e1ab439 (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=2750b1a94cbf38b4fe17b154bd9ec879108c6288
commit 2750b1a94cbf38b4fe17b154bd9ec879108c6288
Merge: 4dac995 bb3c87f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 13 14:05:41 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Nov 13 14:05:41 2014 -0500

    Merge topic 'vs-nsight-tegra-version' into next
    
    bb3c87f1 VS: Change Nsight Tegra 2.0 Project Revision Number from 8 to 9


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bb3c87f1da7047419d4f81979ce0daf71818b8d6
commit bb3c87f1da7047419d4f81979ce0daf71818b8d6
Author:     Dmitry Polyanitsa <dpolyanitsa at nvidia.com>
AuthorDate: Thu Nov 13 20:57:41 2014 +0300
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Nov 13 14:05:12 2014 -0500

    VS: Change Nsight Tegra 2.0 Project Revision Number from 8 to 9
    
    A hotfix to Nsight Tegra 2.0 needed to increase the project number.
    Teach CMake to generate the newer number for this version.

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 26fc317..8109b16 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -326,9 +326,9 @@ void cmVisualStudio10TargetGenerator::Generate()
     this->WriteString("<PropertyGroup Label=\"NsightTegraProject\">\n", 1);
     if(this->NsightTegraVersion[0] >= 2)
       {
-      // Nsight Tegra 2.0 uses project revision 8.
+      // Nsight Tegra 2.0 uses project revision 9.
       this->WriteString("<NsightTegraProjectRevisionNumber>"
-                        "8"
+                        "9"
                         "</NsightTegraProjectRevisionNumber>\n", 2);
       // Tell newer versions to upgrade silently when loading.
       this->WriteString("<NsightTegraUpgradeOnceWithoutPrompt>"

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

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


hooks/post-receive
-- 
CMake