[Cmake-commits] CMake branch, next, updated. v3.0.2-5473-g17049e2

[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  17049e24202ad12c115d657cdd429f50c2b7defb (commit)
       via  893f855d8a088e78aa265282ecc5b7239c98c4dc (commit)
       via  4c7080fd4030622010cd7126029b04ab9d50c3ba (commit)
       via  d92f2229bed19d4d1a7d4bd5538578688aaaa78c (commit)
      from  57aaf83f89c4223cf01dbe5d08fabc6c38fefbae (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=17049e24202ad12c115d657cdd429f50c2b7defb
commit 17049e24202ad12c115d657cdd429f50c2b7defb
Merge: 57aaf83 893f855
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 26 10:20:03 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Sep 26 10:20:03 2014 -0400

    Merge topic 'vs-nsight-tegra-generator' into next
    
    893f855d Help: Update 'vs-nsight-tegra-generator' notes for VS 2010
    4c7080fd Tests: Run VSNsightTegra test for VS 2010
    d92f2229 VS: Drop GenerateManifest from .vcxproj files for non-MS tools


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=893f855d8a088e78aa265282ecc5b7239c98c4dc
commit 893f855d8a088e78aa265282ecc5b7239c98c4dc
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 26 10:17:49 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Sep 26 10:17:49 2014 -0400

    Help: Update 'vs-nsight-tegra-generator' notes for VS 2010

diff --git a/Help/release/dev/vs-nsight-tegra-generator.rst b/Help/release/dev/vs-nsight-tegra-generator.rst
index a5d916b..92f4236 100644
--- a/Help/release/dev/vs-nsight-tegra-generator.rst
+++ b/Help/release/dev/vs-nsight-tegra-generator.rst
@@ -1,7 +1,7 @@
 vs-nsight-tegra-generator
 -------------------------
 
-* Generators for Visual Studio 11 (2012) and above learned to generate
+* Generators for Visual Studio 10 (2010) and above learned to generate
   projects for NVIDIA Nsight Tegra Visual Studio Edition.  One may set
   the :variable:`CMAKE_SYSTEM_NAME` variable to ``Android`` on the
   :manual:`cmake(1)` command-line or in a :variable:`CMAKE_TOOLCHAIN_FILE`

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4c7080fd4030622010cd7126029b04ab9d50c3ba
commit 4c7080fd4030622010cd7126029b04ab9d50c3ba
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 26 10:14:14 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Sep 26 10:17:47 2014 -0400

    Tests: Run VSNsightTegra test for VS 2010

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index f80446d..acb6b86 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1781,6 +1781,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
   endif()
 
   if(WIN32)
+    set(reg_vs10 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\10.0;InstallDir]")
     set(reg_vs11 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\11.0;InstallDir]")
     set(reg_vs12 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\12.0;InstallDir]")
     set(reg_ws80 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows\\v8.0;InstallationFolder]")
@@ -1788,7 +1789,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
     set(reg_wp80 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Microsoft SDKs\\WindowsPhone\\v8.0;InstallationFolder]")
     set(reg_wp81 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Microsoft SDKs\\WindowsPhone\\v8.1;InstallationFolder]")
     set(reg_tegra "[HKEY_LOCAL_MACHINE\\SOFTWARE\\NVIDIA Corporation\\Nsight Tegra;sdkRoot]")
-    foreach(reg vs11 vs12 ws80 ws81 wp80 wp81 tegra)
+    foreach(reg vs10 vs11 vs12 ws80 ws81 wp80 wp81 tegra)
       get_filename_component(r "${reg_${reg}}" ABSOLUTE)
       if(IS_DIRECTORY "${r}")
         set(${reg} 1)
@@ -1847,6 +1848,9 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
         )
       list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/VSNsightTegra/${name}")
     endmacro()
+    if(vs10)
+      add_test_VSNsightTegra(vs10 "Visual Studio 10 2010")
+    endif()
     if(vs11)
       add_test_VSNsightTegra(vs11 "Visual Studio 11 2012")
     endif()

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d92f2229bed19d4d1a7d4bd5538578688aaaa78c
commit d92f2229bed19d4d1a7d4bd5538578688aaaa78c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 26 10:12:31 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Sep 26 10:16:54 2014 -0400

    VS: Drop GenerateManifest from .vcxproj files for non-MS tools
    
    The .vcxproj file content generated by OutputLinkIncremental is
    specific to MS tools, so drop it when using other tools.

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index b5b99d8..cb19402 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -1665,6 +1665,10 @@ void
 cmVisualStudio10TargetGenerator::
 OutputLinkIncremental(std::string const& configName)
 {
+  if(!this->MSTools)
+    {
+    return;
+    }
   // static libraries and things greater than modules do not need
   // to set this option
   if(this->Target->GetType() == cmTarget::STATIC_LIBRARY

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

Summary of changes:
 Help/release/dev/vs-nsight-tegra-generator.rst |    2 +-
 Source/cmVisualStudio10TargetGenerator.cxx     |    4 ++++
 Tests/CMakeLists.txt                           |    6 +++++-
 3 files changed, 10 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake