[Cmake-commits] CMake branch, master, updated. v3.4.1-800-gcedbb79

[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, master has been updated
       via  cedbb7994dddce2c3fdf846bf4563c846adf4632 (commit)
       via  f086c665da00228cabf465dc1eb7223d40fd6270 (commit)
      from  d9f9c4fbc0a02f048793f4b91aeb5c65d9571e84 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cedbb7994dddce2c3fdf846bf4563c846adf4632
commit cedbb7994dddce2c3fdf846bf4563c846adf4632
Merge: d9f9c4f f086c66
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 11 09:17:41 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 11 09:17:41 2016 -0500

    Merge topic 'vs14-debug-enum'
    
    f086c665 VS: Fix VS 2015 .vcxproj file value for GenerateDebugInformation (#15894)

diff --cc Source/cmVisualStudio10TargetGenerator.cxx
index 6e1fb5b,6b46773..669c785
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@@ -2603,13 -2591,20 +2611,21 @@@ cmVisualStudio10TargetGenerator::Comput
        }
      else
        {
-       linkOptions.AddFlag("GenerateDebugInformation", "false");
+       if (this->LocalGenerator->GetVersion() >=
+           cmGlobalVisualStudioGenerator::VS14)
+         {
+         linkOptions.AddFlag("GenerateDebugInformation", "No");
+         }
+       else
+         {
+         linkOptions.AddFlag("GenerateDebugInformation", "false");
+         }
        }
 -    std::string pdb = this->Target->GetPDBDirectory(config.c_str());
 +    std::string pdb = this->GeneratorTarget->GetPDBDirectory(config.c_str());
      pdb += "/";
      pdb += targetNamePDB;
 -    std::string imLib = this->Target->GetDirectory(config.c_str(), true);
 +    std::string imLib =
 +        this->GeneratorTarget->GetDirectory(config.c_str(), true);
      imLib += "/";
      imLib += targetNameImport;
  

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

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


hooks/post-receive
-- 
CMake