[Cmake-commits] CMake branch, next, updated. v2.8.3-1599-g754520b
David Cole
david.cole at kitware.com
Wed Feb 9 13:04:22 EST 2011
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 754520b2b5d2cb6c9e74c266d82fa6189702b7b3 (commit)
via fbca267331b1d85f92ea27dfcb9490369c56cf77 (commit)
via 98b448ee9e1fc12181667c5f7431163097466daf (commit)
from f80bb47cb72b9fe9607e740766a188ccdebf34dd (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=754520b2b5d2cb6c9e74c266d82fa6189702b7b3
commit 754520b2b5d2cb6c9e74c266d82fa6189702b7b3
Merge: f80bb47 fbca267
Author: David Cole <david.cole at kitware.com>
AuthorDate: Wed Feb 9 13:04:19 2011 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 9 13:04:19 2011 -0500
Merge topic 'fix-10704-manifest-no-vs10' into next
fbca267 VS: Only use /MANIFEST if hasManifest is true (#11216)
98b448e VS2010: Fixed GenerateManifest flag (#10704)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fbca267331b1d85f92ea27dfcb9490369c56cf77
commit fbca267331b1d85f92ea27dfcb9490369c56cf77
Author: David Cole <david.cole at kitware.com>
AuthorDate: Wed Feb 9 11:42:34 2011 -0500
Commit: David Cole <david.cole at kitware.com>
CommitDate: Wed Feb 9 13:01:31 2011 -0500
VS: Only use /MANIFEST if hasManifest is true (#11216)
Thanks to Jörg Riedel for the patch.
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index bab0aaf..4ade5da 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -4108,7 +4108,10 @@ int cmake::VisualStudioLinkNonIncremental(std::vector<std::string>& args,
return -1;
}
// Run the link command as given
- linkCommand.push_back("/MANIFEST");
+ if (hasManifest)
+ {
+ linkCommand.push_back("/MANIFEST");
+ }
if(!cmake::RunCommand("LINK", linkCommand, verbose))
{
return -1;
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=98b448ee9e1fc12181667c5f7431163097466daf
commit 98b448ee9e1fc12181667c5f7431163097466daf
Author: David Cole <david.cole at kitware.com>
AuthorDate: Wed Feb 9 12:59:09 2011 -0500
Commit: David Cole <david.cole at kitware.com>
CommitDate: Wed Feb 9 13:01:19 2011 -0500
VS2010: Fixed GenerateManifest flag (#10704)
Thanks to "McBen <viertelvor12 at gmx.net>" for the patch.
(Did not preserve original commit author information because
we have a push check for first and last name, and do not
accept authors with only an alias...)
diff --git a/Source/cmIDEOptions.cxx b/Source/cmIDEOptions.cxx
index 7acb0f0..d9c0e87 100644
--- a/Source/cmIDEOptions.cxx
+++ b/Source/cmIDEOptions.cxx
@@ -171,3 +171,9 @@ void cmIDEOptions::AddFlag(const char* flag, const char* value)
{
this->FlagMap[flag] = value;
}
+
+//----------------------------------------------------------------------------
+void cmIDEOptions::RemoveFlag(const char* flag)
+{
+ this->FlagMap.erase(flag);
+}
diff --git a/Source/cmIDEOptions.h b/Source/cmIDEOptions.h
index a156b23..a5be8fb 100644
--- a/Source/cmIDEOptions.h
+++ b/Source/cmIDEOptions.h
@@ -28,6 +28,7 @@ public:
void AddDefine(const std::string& define);
void AddDefines(const char* defines);
void AddFlag(const char* flag, const char* value);
+ void RemoveFlag(const char* flag);
protected:
// create a map of xml tags to the values they should have in the output
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 4cb745e..8a27ffd 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -167,6 +167,7 @@ void cmVisualStudio10TargetGenerator::Generate()
// Write the encoding header into the file
char magic[] = {0xEF,0xBB, 0xBF};
this->BuildFileStream->write(magic, 3);
+ this->WriteString("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n",0);
this->WriteString("<Project DefaultTargets=\"Build\" "
"ToolsVersion=\"4.0\" "
"xmlns=\"http://schemas.microsoft.com/"
@@ -998,6 +999,15 @@ OutputLinkIncremental(std::string const& configName)
this->WritePlatformConfigTag("LinkIncremental", configName.c_str(), 3);
*this->BuildFileStream << incremental
<< "</LinkIncremental>\n";
+
+ const char* manifest = "true";
+ if(flags.find("MANIFEST:NO") != flags.npos)
+ {
+ manifest = "false";
+ }
+ this->WritePlatformConfigTag("GenerateManifest", configName.c_str(), 3);
+ *this->BuildFileStream << manifest
+ << "</GenerateManifest>\n";
}
//----------------------------------------------------------------------------
@@ -1326,7 +1336,7 @@ void cmVisualStudio10TargetGenerator::WriteLinkOptions(std::string const&
linkDirs += "%(AdditionalLibraryDirectories)";
linkOptions.AddFlag("AdditionalLibraryDirectories", linkDirs.c_str());
linkOptions.AddFlag("AdditionalDependencies", libs.c_str());
- linkOptions.AddFlag("Version", "0.0");
+ linkOptions.AddFlag("Version", "");
if(linkOptions.IsDebug() || flags.find("/debug") != flags.npos)
{
linkOptions.AddFlag("GenerateDebugInformation", "true");
@@ -1369,6 +1379,8 @@ void cmVisualStudio10TargetGenerator::WriteLinkOptions(std::string const&
linkOptions.AddFlag("ModuleDefinitionFile",
this->ModuleDefinitionFile.c_str());
}
+
+ linkOptions.RemoveFlag("GenerateManifest");
linkOptions.OutputAdditionalOptions(*this->BuildFileStream, " ", "");
linkOptions.OutputFlagMap(*this->BuildFileStream, " ");
-----------------------------------------------------------------------
Summary of changes:
Source/cmIDEOptions.cxx | 6 ++++++
Source/cmIDEOptions.h | 1 +
Source/cmVisualStudio10TargetGenerator.cxx | 14 +++++++++++++-
Source/cmake.cxx | 5 ++++-
4 files changed, 24 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list