[Cmake-commits] CMake branch, next, updated. v3.2.2-2809-g9a19e0d
Stephen Kelly
steveire at gmail.com
Sat May 16 10:46:56 EDT 2015
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 9a19e0d8835c72583ee7e66153e378f7308f9a33 (commit)
via c7f27f4471b1916a6b71b6c7205864fa9a4d9f64 (commit)
via 2b5d3706ddb22a5eb9e9359994e1f374d4681c2d (commit)
from 3a019101452d94fd9f4a5aafbc10dbbdc1afede9 (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=9a19e0d8835c72583ee7e66153e378f7308f9a33
commit 9a19e0d8835c72583ee7e66153e378f7308f9a33
Merge: 3a01910 c7f27f4
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat May 16 10:46:55 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat May 16 10:46:55 2015 -0400
Merge topic 'clean-up-cmMakefile' into next
c7f27f44 cmCTest: Remove unimplemented method.
2b5d3706 cmMakefile: Remove Print() debugging facilities.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c7f27f4471b1916a6b71b6c7205864fa9a4d9f64
commit c7f27f4471b1916a6b71b6c7205864fa9a4d9f64
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat May 16 16:46:12 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sat May 16 16:46:25 2015 +0200
cmCTest: Remove unimplemented method.
diff --git a/Source/cmTest.h b/Source/cmTest.h
index c6e7e42..ca88afe 100644
--- a/Source/cmTest.h
+++ b/Source/cmTest.h
@@ -40,11 +40,6 @@ public:
return this->Command;
}
- /**
- * Print the structure to std::cout.
- */
- void Print() const;
-
///! Set/Get a property of this source file
void SetProperty(const std::string& prop, const char *value);
void AppendProperty(const std::string& prop,
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2b5d3706ddb22a5eb9e9359994e1f374d4681c2d
commit 2b5d3706ddb22a5eb9e9359994e1f374d4681c2d
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat May 16 16:43:17 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sat May 16 16:43:17 2015 +0200
cmMakefile: Remove Print() debugging facilities.
They don't print things that are important in the modern implementation.
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 6c5e61a..43490a3 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -259,59 +259,6 @@ cmMakefile::~cmMakefile()
}
}
-void cmMakefile::PrintStringVector(const char* s,
- const std::vector<std::string>& v) const
-{
- std::cout << s << ": ( \n" << cmWrap('"', v, '"', " ") << ")\n";
-}
-
-void cmMakefile
-::PrintStringVector(const char* s,
- const std::vector<std::pair<std::string, bool> >& v) const
-{
- std::cout << s << ": ( \n";
- for(std::vector<std::pair<std::string, bool> >::const_iterator i
- = v.begin(); i != v.end(); ++i)
- {
- std::cout << i->first << " " << i->second;
- }
- std::cout << " )\n";
-}
-
-
-// call print on all the classes in the makefile
-void cmMakefile::Print() const
-{
- // print the class lists
- std::cout << "classes:\n";
-
- std::cout << " this->Targets: ";
- for (cmTargets::iterator l = this->Targets.begin();
- l != this->Targets.end(); l++)
- {
- std::cout << l->first << std::endl;
- }
-
- std::cout << " this->StartOutputDirectory; " <<
- this->GetCurrentBinaryDirectory() << std::endl;
- std::cout << " this->HomeOutputDirectory; " <<
- this->GetHomeOutputDirectory() << std::endl;
- std::cout << " this->cmStartDirectory; " <<
- this->GetCurrentSourceDirectory() << std::endl;
- std::cout << " this->cmHomeDirectory; " <<
- this->GetHomeDirectory() << std::endl;
- std::cout << " this->ProjectName; "
- << this->ProjectName << std::endl;
- this->PrintStringVector("this->LinkDirectories", this->LinkDirectories);
-#if defined(CMAKE_BUILD_WITH_CMAKE)
- for( std::vector<cmSourceGroup>::const_iterator i =
- this->SourceGroups.begin(); i != this->SourceGroups.end(); ++i)
- {
- std::cout << "Source Group: " << i->GetName() << std::endl;
- }
-#endif
-}
-
//----------------------------------------------------------------------------
void cmMakefile::IssueMessage(cmake::MessageType t,
std::string const& text) const
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index a20bd56..5d6419a 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -154,11 +154,6 @@ public:
*/
void FinalPass();
- /**
- * Print the object state to std::cout.
- */
- void Print() const;
-
/** Add a custom command to the build. */
void AddCustomCommandToTarget(const std::string& target,
const std::vector<std::string>& byproducts,
@@ -924,10 +919,6 @@ private:
friend class cmMakeDepend; // make depend needs direct access
// to the Sources array
- void PrintStringVector(const char* s, const
- std::vector<std::pair<std::string, bool> >& v) const;
- void PrintStringVector(const char* s,
- const std::vector<std::string>& v) const;
void AddDefaultDefinitions();
typedef std::vector<cmFunctionBlocker*> FunctionBlockersType;
-----------------------------------------------------------------------
Summary of changes:
Source/cmMakefile.cxx | 53 -------------------------------------------------
Source/cmMakefile.h | 9 ---------
Source/cmTest.h | 5 -----
3 files changed, 67 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list