Copyright © 2000 - 2018 MantisBT Team

diff --git a/Source/cmGlobalVisualStudio10Generator.h b/Source/cmGlobalVisualStudio10Generator.h
index 6bf4740..9fa9548 100644
--- a/Source/cmGlobalVisualStudio10Generator.h
+++ b/Source/cmGlobalVisualStudio10Generator.h
@@ -88,6 +88,10 @@ public:
   bool TargetsWindowsStore() const
     { return this->SystemIsWindowsStore; }
 
+   /** Return true if supporting advanced debug options for linker */
+  bool SupportsAdvLinkDebugOptions() const
+    { return false; }
+
   virtual const char* GetCMakeCFGIntDir() const
     { return "$(Configuration)";}
   bool Find64BitTools(cmMakefile* mf);

diff --git a/Source/cmGlobalVisualStudio14Generator.cxx b/Source/cmGlobalVisualStudio14Generator.cxx
index a05ac24..3e82946 100644
--- a/Source/cmGlobalVisualStudio14Generator.cxx
+++ b/Source/cmGlobalVisualStudio14Generator.cxx
@@ -191,6 +191,12 @@ cmGlobalVisualStudio14Generator::SelectWindowsStoreToolset(
 }
 
 //----------------------------------------------------------------------------
+bool cmGlobalVisualStudio14Generator::SupportsAdvLinkDebugOptions() const
+{
+	return true;
+}
+
+//----------------------------------------------------------------------------
 void cmGlobalVisualStudio14Generator::WriteSLNHeader(std::ostream& fout)
 {
   // Visual Studio 14 writes .sln format 12.00
diff --git a/Source/cmGlobalVisualStudio14Generator.h b/Source/cmGlobalVisualStudio14Generator.h
index 76c15d9..ad511d7 100644
--- a/Source/cmGlobalVisualStudio14Generator.h
+++ b/Source/cmGlobalVisualStudio14Generator.h
@@ -40,6 +40,8 @@ protected:
 
   virtual const char* GetIDEVersion() { return "14.0"; }
   virtual bool SelectWindows10SDK(cmMakefile* mf);
+  
+  virtual bool SupportsAdvLinkDebugOptions() const;
 
   // Used to verify that the Desktop toolset for the current generator is
   // installed on the machine.
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 6e1fb5b..2b81593 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -2597,14 +2597,35 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
       linkOptions.AddFlag("StackReserveSize", stackVal);
       }
 
-    if(linkOptions.IsDebug() || flags.find("/debug") != flags.npos)
-      {
-      linkOptions.AddFlag("GenerateDebugInformation", "true");
-      }
-    else
-      {
-      linkOptions.AddFlag("GenerateDebugInformation", "false");
-      }
+	if (!this->GlobalGenerator->SupportsAdvLinkDebugOptions())
+	{
+		if(linkOptions.IsDebug() || flags.find("/debug") != flags.npos)
+		{
+			linkOptions.AddFlag("GenerateDebugInformation", "true");
+		}
+		else
+		{
+			linkOptions.AddFlag("GenerateDebugInformation", "false");
+		}
+	}
+	else
+	{
+		if (flags.find("/debug:fastlink") != flags.npos)
+		{
+			linkOptions.AddFlag("GenerateDebugInformation", "DebugFastLink");
+			if(this->GeneratorTarget->GetPropertyAsBool("LINK_FULL_PDBS"))
+				linkOptions.AddFlag("FullProgramDatabaseFile", "true");
+		}
+		else if (linkOptions.IsDebug() || flags.find("/debug") != flags.npos)
+		{
+			linkOptions.AddFlag("GenerateDebugInformation", "Debug");
+		}
+		else
+		{
+			linkOptions.AddFlag("GenerateDebugInformation", "No");
+		}
+	}
+
     std::string pdb = this->GeneratorTarget->GetPDBDirectory(config.c_str());
     pdb += "/";
     pdb += targetNamePDB;


Notes
(0040050) Thomas Laguzzi (reporter) 2016-01-04 09:21	I attached a possible patch. Two things I didn't know: - how to switch the behavior between the generators. I added a virtual function to select the old/new behavior, but the name probably is wrong. - Also, when using fastlink ,the new "Generate Full PDB files" option may be useful in some scenarios. Unfortunately that option doesn't have a command line switch, so I actually used a boolean TARGET_PROPERTY which I named LINK_FULL_PDBS , another probably wrong name See the CmakeLists.txt attached which I used to check the results. reference link: (http://blogs.msdn.com/b/vcblog/archive/2015/10/16/debug-fastlink-for-vs2015-update-1.aspx [^])

(0040163) Brad King (manager) 2016-01-08 14:19	Thanks. First I'd like to fix the normal false/true values to fix existing behavior. Please try out this change: VS: Fix VS 2015 .vcxproj file value for GenerateDebugInformation https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f086c665 [^]

(0040170) Thomas Laguzzi (reporter) 2016-01-09 10:32	tested: the commit works, it generates a correct XML

(0040178) Brad King (manager) 2016-01-11 09:53	Re 0015894:0040170: Great, thanks for testing. I've merged that change to 'master' and queued it for merge to 'release' for 3.4.2.

(0040179) Brad King (manager) 2016-01-11 09:54	Next I've followed up with these changes based on 'master': cmIDEOptions: Add support for case-insensitive flags https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4ca9df8b [^] VS: Drop unused condition in link debug flag generation https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c22da7cf [^] VS: Map the link `/debug` to its IDE property https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b3677b35 [^] This cleans up conversion of the /debug flag to the IDE property.

(0040180) Brad King (manager) 2016-01-11 09:58	Now we should be able to move on to /debug:fastlink support. After the cleanup linked in 0015894:0040179 the change can now be something like: ------------------------------------------------------------------------------ diff --git a/Source/cmVS14LinkFlagTable.h b/Source/cmVS14LinkFlagTable.h index 1e781e8..29e3d86 100644 --- a/Source/cmVS14LinkFlagTable.h +++ b/Source/cmVS14LinkFlagTable.h @@ -177,6 +177,8 @@ static cmVS7FlagTable cmVS14LinkFlagTable[] = {"UACUIAccess", "uiAccess='false'", "", "false", 0}, {"UACUIAccess", "uiAccess='true'", "", "true", 0}, {"ManifestEmbed", "manifest:embed", "", "true", 0}, + {"GenerateDebugInformation", "DEBUG:FASTLINK", "", "DebugFastLink", + cmVS7FlagTable::CaseInsensitive}, {"GenerateDebugInformation", "DEBUG", "", "Debug", cmVS7FlagTable::CaseInsensitive}, {"MapExports", "MAPINFO:EXPORTS", "", "true", 0}, ------------------------------------------------------------------------------ However, that does not account for the "Generate Full PDB files" part of your changes. Since that involves a new interface to support a new feature, this issue tracker entry is not a good place to discuss it. Please read CONTRIBUTING.rst at the top of the source tree and raise discussion of /debug:fastlink on the developer list: https://cmake.org/mailman/listinfo/cmake-developers [^]

(0040181) Brad King (manager) 2016-01-11 10:00	I'm marking this issue as 'resolved' because the main problem has been addressed. Support for /debug:fastlink is a new feature that is best discussed separately. Thanks!

(0040194) Thomas Laguzzi (reporter) 2016-01-11 15:32	thanks! I wrote a follow up in the mailing. BTW the "next" branch works good, and also the patch in the comment works good to enable FastLink. If you commit it, only the PDB option will be remaining, but it's not so important

(0040195) Brad King (manager) 2016-01-11 15:55	Re 0015894:0040194: Thanks. For reference, the new thread is here: http://thread.gmane.org/gmane.comp.programming.tools.cmake.devel/15390 [^]

(0040275) Brad King (manager) 2016-01-20 10:26	The change linked in 0015894:0040163 has been merged to 'release' and included in 3.4.2. That fixes the actual bug. Other changes discussed here are post-3.4 development and will be included in 3.5.

(0041243) Kitware Robot (administrator) 2016-06-10 14:21	This issue tracker is no longer used. Further discussion of this issue may take place in the current CMake Issues page linked in the banner at the top of this page.

Issue History
Date Modified	Username	Field	Change
2015-12-23 08:04	Thomas Laguzzi	New Issue
2016-01-04 09:14	Thomas Laguzzi	File Added: cmake.patch
2016-01-04 09:14	Thomas Laguzzi	File Added: CMakeLists.txt
2016-01-04 09:21	Thomas Laguzzi	Note Added: 0040050
2016-01-04 09:22	Thomas Laguzzi	File Added: cmake-corrected.patch
2016-01-04 09:22	Thomas Laguzzi	Tag Attached: patch
2016-01-08 14:19	Brad King	Note Added: 0040163
2016-01-09 10:32	Thomas Laguzzi	Note Added: 0040170
2016-01-11 09:53	Brad King	Note Added: 0040178
2016-01-11 09:54	Brad King	Note Added: 0040179
2016-01-11 09:58	Brad King	Note Added: 0040180
2016-01-11 10:00	Brad King	Note Added: 0040181
2016-01-11 10:00	Brad King	Assigned To	=> Brad King
2016-01-11 10:00	Brad King	Status	new => resolved
2016-01-11 10:00	Brad King	Resolution	open => fixed
2016-01-11 10:00	Brad King	Fixed in Version	=> CMake 3.5
2016-01-11 10:00	Brad King	Target Version	=> CMake 3.5
2016-01-11 15:32	Thomas Laguzzi	Note Added: 0040194
2016-01-11 15:55	Brad King	Note Added: 0040195
2016-01-20 10:26	Brad King	Note Added: 0040275
2016-01-20 10:26	Brad King	Fixed in Version	CMake 3.5 => CMake 3.4.2
2016-01-20 10:26	Brad King	Target Version	CMake 3.5 => CMake 3.4.2
2016-02-24 11:30	Gregor Jasny	Relationship added	related to 0015986
2016-06-10 14:21	Kitware Robot	Note Added: 0041243
2016-06-10 14:21	Kitware Robot	Status	resolved => closed