[Cmake-commits] CMake branch, next, updated. v3.4.1-1881-g7a36e81

[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  7a36e812c4f26bdf7e70d2b284b9f7650a4369ca (commit)
       via  f086c665da00228cabf465dc1eb7223d40fd6270 (commit)
      from  d24f98fc29d6ce0a01218d30f89982b153c3e141 (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=7a36e812c4f26bdf7e70d2b284b9f7650a4369ca
commit 7a36e812c4f26bdf7e70d2b284b9f7650a4369ca
Merge: d24f98f f086c66
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 8 14:17:37 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 8 14:17:37 2016 -0500

    Merge topic 'vs14-debug-enum' into next
    
    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;
  

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f086c665da00228cabf465dc1eb7223d40fd6270
commit f086c665da00228cabf465dc1eb7223d40fd6270
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 8 14:12:48 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jan 8 14:15:39 2016 -0500

    VS: Fix VS 2015 .vcxproj file value for GenerateDebugInformation (#15894)
    
    Starting with VS 2015 the GenerateDebugInformation build property is an
    enumeration (`No`, `Debug`, `DebugFastLink`) instead of a boolean value
    (`false`, `true`).  For now we simply change to `No` and `Debug` fix
    current behavior.  Support for `/debug:fastlink` can be added later.

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 1de2847..6b46773 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -2579,11 +2579,27 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
 
     if(linkOptions.IsDebug() || flags.find("/debug") != flags.npos)
       {
-      linkOptions.AddFlag("GenerateDebugInformation", "true");
+      if (this->LocalGenerator->GetVersion() >=
+          cmGlobalVisualStudioGenerator::VS14)
+        {
+        linkOptions.AddFlag("GenerateDebugInformation", "Debug");
+        }
+      else
+        {
+        linkOptions.AddFlag("GenerateDebugInformation", "true");
+        }
       }
     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());
     pdb += "/";

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

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


hooks/post-receive
-- 
CMake