[Cmake-commits] CMake branch, next, updated. v2.8.3-800-gb7ea1c5
Brad King
brad.king at kitware.com
Fri Dec 10 16:38:32 EST 2010
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 b7ea1c5879ce1025828f7b4ecc153a4aed67604d (commit)
via 10f01ae962feb68177f7bd698b01bbc18668920c (commit)
via 57e71533f45601275afd7787d763664f9e6b9536 (commit)
via 772817242bf1c94697b06f711f1cd24ad5b0d8d8 (commit)
from 3a8428979e93b052c50dcbeda4c9e88f7c6ac6be (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=b7ea1c5879ce1025828f7b4ecc153a4aed67604d
commit b7ea1c5879ce1025828f7b4ecc153a4aed67604d
Merge: 3a84289 10f01ae
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Dec 10 16:38:29 2010 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Dec 10 16:38:29 2010 -0500
Merge topic 'vs10-sln-msbuild-workaround' into next
10f01ae Remove unused parameter "root" in some VS generator methods
57e7153 Avoid msbuild idiosyncrasy that builds multiple configs (#11594)
7728172 Remove unused variable "rootdir" in VS generators
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=10f01ae962feb68177f7bd698b01bbc18668920c
commit 10f01ae962feb68177f7bd698b01bbc18668920c
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Dec 10 14:33:34 2010 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Dec 10 14:33:34 2010 -0500
Remove unused parameter "root" in some VS generator methods
The previous commit removed the last use of this parameter from the
implementation of WriteTargetsToSolution. Remove the parameter.
diff --git a/Source/cmGlobalVisualStudio71Generator.cxx b/Source/cmGlobalVisualStudio71Generator.cxx
index ba18687..2874952 100644
--- a/Source/cmGlobalVisualStudio71Generator.cxx
+++ b/Source/cmGlobalVisualStudio71Generator.cxx
@@ -110,7 +110,7 @@ void cmGlobalVisualStudio71Generator
this->GetTargetSets(projectTargets, originalTargets, root, generators);
OrderedTargetDependSet orderedProjectTargets(projectTargets);
- this->WriteTargetsToSolution(fout, root, orderedProjectTargets);
+ this->WriteTargetsToSolution(fout, orderedProjectTargets);
bool useFolderProperty = this->UseFolderProperty();
if (useFolderProperty)
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index 6858674..eb84a2c 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -270,7 +270,6 @@ void cmGlobalVisualStudio7Generator::WriteTargetConfigurations(
void cmGlobalVisualStudio7Generator::WriteTargetsToSolution(
std::ostream& fout,
- cmLocalGenerator* root,
OrderedTargetDependSet const& projectTargets)
{
for(OrderedTargetDependSet::const_iterator tt =
@@ -386,7 +385,7 @@ void cmGlobalVisualStudio7Generator
this->GetTargetSets(projectTargets, originalTargets, root, generators);
OrderedTargetDependSet orderedProjectTargets(projectTargets);
- this->WriteTargetsToSolution(fout, root, orderedProjectTargets);
+ this->WriteTargetsToSolution(fout, orderedProjectTargets);
bool useFolderProperty = this->UseFolderProperty();
if (useFolderProperty)
diff --git a/Source/cmGlobalVisualStudio7Generator.h b/Source/cmGlobalVisualStudio7Generator.h
index b6c84e8..57c079d 100644
--- a/Source/cmGlobalVisualStudio7Generator.h
+++ b/Source/cmGlobalVisualStudio7Generator.h
@@ -118,7 +118,6 @@ protected:
virtual void WriteTargetsToSolution(
std::ostream& fout,
- cmLocalGenerator* root,
OrderedTargetDependSet const& projectTargets);
virtual void WriteTargetDepends(
std::ostream& fout,
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=57e71533f45601275afd7787d763664f9e6b9536
commit 57e71533f45601275afd7787d763664f9e6b9536
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Dec 10 14:26:56 2010 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Dec 10 14:26:56 2010 -0500
Avoid msbuild idiosyncrasy that builds multiple configs (#11594)
If a .sln file refers to a project file with a leading ".\", as in
".\foo.vcxproj" instead of just "foo.vcxproj" or a full path then
msbuild behaves strangely. Whenever target foo is built as a dependency
of another target, msbuild brings multiple configurations up to date
instead of just the requested configuration!
Refer to all project files by full path to avoid this behavior.
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index d421c7f..6858674 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -297,8 +297,6 @@ void cmGlobalVisualStudio7Generator::WriteTargetsToSolution(
{
cmMakefile* tmf = target->GetMakefile();
std::string dir = tmf->GetStartOutputDirectory();
- dir = root->Convert(dir.c_str(),
- cmLocalGenerator::START_OUTPUT);
this->WriteProject(fout, vcprojName, dir.c_str(),
*target);
written = true;
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=772817242bf1c94697b06f711f1cd24ad5b0d8d8
commit 772817242bf1c94697b06f711f1cd24ad5b0d8d8
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Dec 10 14:21:18 2010 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Dec 10 14:21:18 2010 -0500
Remove unused variable "rootdir" in VS generators
diff --git a/Source/cmGlobalVisualStudio6Generator.cxx b/Source/cmGlobalVisualStudio6Generator.cxx
index 203ca77..fe44e20 100644
--- a/Source/cmGlobalVisualStudio6Generator.cxx
+++ b/Source/cmGlobalVisualStudio6Generator.cxx
@@ -197,8 +197,6 @@ void cmGlobalVisualStudio6Generator
this->GetTargetSets(projectTargets, originalTargets, root, generators);
OrderedTargetDependSet orderedProjectTargets(projectTargets);
- std::string rootdir = root->GetMakefile()->GetStartOutputDirectory();
- rootdir += "/";
for(OrderedTargetDependSet::const_iterator
tt = orderedProjectTargets.begin();
tt != orderedProjectTargets.end(); ++tt)
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index 45d6a74..d421c7f 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -273,8 +273,6 @@ void cmGlobalVisualStudio7Generator::WriteTargetsToSolution(
cmLocalGenerator* root,
OrderedTargetDependSet const& projectTargets)
{
- std::string rootdir = root->GetMakefile()->GetStartOutputDirectory();
- rootdir += "/";
for(OrderedTargetDependSet::const_iterator tt =
projectTargets.begin(); tt != projectTargets.end(); ++tt)
{
-----------------------------------------------------------------------
Summary of changes:
Source/cmGlobalVisualStudio6Generator.cxx | 2 --
Source/cmGlobalVisualStudio71Generator.cxx | 2 +-
Source/cmGlobalVisualStudio7Generator.cxx | 7 +------
Source/cmGlobalVisualStudio7Generator.h | 1 -
4 files changed, 2 insertions(+), 10 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list