summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-09-26 14:12:31 (GMT)
committerBrad King <brad.king@kitware.com>2014-09-29 20:05:52 (GMT)
commitc655f0c417f66096a62bb837e163ec636665dd69 (patch)
treef590b8f76cfcf910b6b0c70bef16931520d051b5
parent227a336714274992f90ad171bd6588d8dd17b76c (diff)
downloadCMake-c655f0c417f66096a62bb837e163ec636665dd69.zip
CMake-c655f0c417f66096a62bb837e163ec636665dd69.tar.gz
CMake-c655f0c417f66096a62bb837e163ec636665dd69.tar.bz2
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.
-rw-r--r--Source/cmVisualStudio10TargetGenerator.cxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 3cb0c61..a13cbd2 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -1593,6 +1593,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