[Cmake-commits] CMake branch, next, updated. v3.2.1-1769-gcb1ea87
Stephen Kelly
steveire at gmail.com
Sun Apr 12 17:11:04 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 cb1ea87c8d8bff131594cd7837a078079ba36286 (commit)
via 07d44d638bca028d2a76fb1ffdc1f1542184243c (commit)
via ea819b29f8735ca09242cc646a7b25e933bc913c (commit)
via 6ad86c7fc4167561c7c13c28482a5fea0fe9d70b (commit)
via fca2b542b43546c64aa2c474b810890e52bd0ea4 (commit)
via 7bb4e3db069e06fe2eac053e329ffb9f1ea322bf (commit)
via 6241253a4b20e74625b855b1e0d5220c8e7282b1 (commit)
via 0ee3ccb3b0a25264e8302a150eee297dd40affde (commit)
from ece47efcfadae336402a9e58f99534aa243d12c5 (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=cb1ea87c8d8bff131594cd7837a078079ba36286
commit cb1ea87c8d8bff131594cd7837a078079ba36286
Merge: ece47ef 07d44d6
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Apr 12 17:11:03 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Apr 12 17:11:03 2015 -0400
Merge topic 'cmake-cleanups' into next
07d44d63 cmake: Remove confusing duplication.
ea819b29 cmMakefile: Remove unused method.
6ad86c7f cmMakefile: Remove bad comment.
fca2b542 cmMakefile: Internalize setting of CMakeInstance on Properties.
7bb4e3db cmMakefile: Out-of-line Home directory accessors.
6241253a cmake: Out-of-line Home and Start directory methods.
0ee3ccb3 cmake: Fix variable name bugs.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=07d44d638bca028d2a76fb1ffdc1f1542184243c
commit 07d44d638bca028d2a76fb1ffdc1f1542184243c
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Apr 12 19:22:09 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Apr 12 23:10:45 2015 +0200
cmake: Remove confusing duplication.
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index ec05a0e..7ccd76a 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -843,12 +843,8 @@ void cmake::SetArgs(const std::vector<std::string>& args,
{
this->SetHomeOutputDirectory
(cmSystemTools::GetCurrentWorkingDirectory());
- this->SetStartOutputDirectory
- (cmSystemTools::GetCurrentWorkingDirectory());
this->SetHomeDirectory
(cmSystemTools::GetCurrentWorkingDirectory());
- this->SetStartDirectory
- (cmSystemTools::GetCurrentWorkingDirectory());
}
this->SetStartDirectory(this->GetHomeDirectory());
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ea819b29f8735ca09242cc646a7b25e933bc913c
commit ea819b29f8735ca09242cc646a7b25e933bc913c
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Apr 12 18:34:12 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Apr 12 23:10:45 2015 +0200
cmMakefile: Remove unused method.
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index ec0a165..35fdd0c 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1676,33 +1676,6 @@ void cmMakefile::ConfigureSubDirectory(cmLocalGenerator *lg2)
}
}
-void cmMakefile::AddSubDirectory(const std::string& sub,
- bool excludeFromAll)
-{
- // the source path must be made full if it isn't already
- std::string srcPath = sub;
- if (!cmSystemTools::FileIsFullPath(srcPath.c_str()))
- {
- srcPath = this->GetCurrentDirectory();
- srcPath += "/";
- srcPath += sub;
- }
-
- // binary path must be made full if it isn't already
- std::string binPath = sub;
- if (!cmSystemTools::FileIsFullPath(binPath.c_str()))
- {
- binPath = this->GetCurrentOutputDirectory();
- binPath += "/";
- binPath += sub;
- }
-
-
- this->AddSubDirectory(srcPath, binPath,
- excludeFromAll, false);
-}
-
-
void cmMakefile::AddSubDirectory(const std::string& srcPath,
const std::string& binPath,
bool excludeFromAll,
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 823acb1..b78f921 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -281,7 +281,6 @@ public:
/**
* Add a subdirectory to the build.
*/
- void AddSubDirectory(const std::string&, bool excludeFromAll=false);
void AddSubDirectory(const std::string& fullSrcDir,
const std::string& fullBinDir,
bool excludeFromAll,
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6ad86c7fc4167561c7c13c28482a5fea0fe9d70b
commit 6ad86c7fc4167561c7c13c28482a5fea0fe9d70b
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Apr 12 18:47:24 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Apr 12 23:10:45 2015 +0200
cmMakefile: Remove bad comment.
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 35be1b7..ec0a165 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1658,7 +1658,6 @@ void cmMakefile::InitializeFromParent()
void cmMakefile::ConfigureSubDirectory(cmLocalGenerator *lg2)
{
- // copy our variables from the child makefile
lg2->GetMakefile()->InitializeFromParent();
lg2->GetMakefile()->MakeStartDirectoriesCurrent();
if (this->GetCMakeInstance()->GetDebugOutput())
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fca2b542b43546c64aa2c474b810890e52bd0ea4
commit fca2b542b43546c64aa2c474b810890e52bd0ea4
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Apr 12 20:10:48 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Apr 12 23:10:45 2015 +0200
cmMakefile: Internalize setting of CMakeInstance on Properties.
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index e1998e4..c143bce 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -252,7 +252,6 @@ void cmLocalGenerator::SetGlobalGenerator(cmGlobalGenerator *gg)
this->Makefile->SetLocalGenerator(this);
// setup the home directories
- this->Makefile->GetProperties().SetCMakeInstance(gg->GetCMakeInstance());
this->Makefile->SetHomeDirectory(
gg->GetCMakeInstance()->GetHomeDirectory());
this->Makefile->SetHomeOutputDirectory(
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index dea9e46..35be1b7 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -741,6 +741,7 @@ void cmMakefile::SetLocalGenerator(cmLocalGenerator* lg)
this->AddSourceGroup("Object Files", "\\.(lo|o|obj)$");
#endif
+ this->Properties.SetCMakeInstance(this->GetCMakeInstance());
this->WarnUnused = this->GetCMakeInstance()->GetWarnUnused();
this->CheckSystemVars = this->GetCMakeInstance()->GetCheckSystemVars();
}
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7bb4e3db069e06fe2eac053e329ffb9f1ea322bf
commit 7bb4e3db069e06fe2eac053e329ffb9f1ea322bf
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Apr 12 20:10:45 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Apr 12 23:10:44 2015 +0200
cmMakefile: Out-of-line Home directory accessors.
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 34b4621..dea9e46 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -3461,6 +3461,11 @@ cmMakefile::LexicalPushPop::~LexicalPushPop()
this->Makefile->PopFunctionBlockerBarrier(this->ReportError);
}
+const char* cmMakefile::GetHomeDirectory() const
+{
+ return this->cmHomeDirectory.c_str();
+}
+
void cmMakefile::SetHomeDirectory(const std::string& dir)
{
this->cmHomeDirectory = dir;
@@ -3472,6 +3477,11 @@ void cmMakefile::SetHomeDirectory(const std::string& dir)
}
}
+const char* cmMakefile::GetHomeOutputDirectory() const
+{
+ return this->HomeOutputDirectory.c_str();
+}
+
void cmMakefile::SetHomeOutputDirectory(const std::string& lib)
{
this->HomeOutputDirectory = lib;
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 5209891..823acb1 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -438,15 +438,9 @@ public:
* and going up until it reaches the HomeDirectory.
*/
void SetHomeDirectory(const std::string& dir);
- const char* GetHomeDirectory() const
- {
- return this->cmHomeDirectory.c_str();
- }
+ const char* GetHomeDirectory() const;
void SetHomeOutputDirectory(const std::string& lib);
- const char* GetHomeOutputDirectory() const
- {
- return this->HomeOutputDirectory.c_str();
- }
+ const char* GetHomeOutputDirectory() const;
//@}
/**
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6241253a4b20e74625b855b1e0d5220c8e7282b1
commit 6241253a4b20e74625b855b1e0d5220c8e7282b1
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Apr 12 20:10:40 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Apr 12 23:10:44 2015 +0200
cmake: Out-of-line Home and Start directory methods.
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index f182ad2..ec05a0e 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -1112,12 +1112,44 @@ void cmake::SetHomeDirectory(const std::string& dir)
cmSystemTools::ConvertToUnixSlashes(this->cmHomeDirectory);
}
+const char* cmake::GetHomeDirectory() const
+{
+ return this->cmHomeDirectory.c_str();
+}
+
void cmake::SetHomeOutputDirectory(const std::string& dir)
{
this->HomeOutputDirectory = dir;
cmSystemTools::ConvertToUnixSlashes(this->HomeOutputDirectory);
}
+const char* cmake::GetHomeOutputDirectory() const
+{
+ return this->HomeOutputDirectory.c_str();
+}
+
+const char* cmake::GetStartDirectory() const
+{
+ return this->cmStartDirectory.c_str();
+}
+
+void cmake::SetStartDirectory(const std::string& dir)
+{
+ this->cmStartDirectory = dir;
+ cmSystemTools::ConvertToUnixSlashes(this->cmStartDirectory);
+}
+
+const char* cmake::GetStartOutputDirectory() const
+{
+ return this->StartOutputDirectory.c_str();
+}
+
+void cmake::SetStartOutputDirectory(const std::string& dir)
+{
+ this->StartOutputDirectory = dir;
+ cmSystemTools::ConvertToUnixSlashes(this->StartOutputDirectory);
+}
+
void cmake::SetGlobalGenerator(cmGlobalGenerator *gg)
{
if(!gg)
diff --git a/Source/cmake.h b/Source/cmake.h
index 26ee8fe..87b771d 100644
--- a/Source/cmake.h
+++ b/Source/cmake.h
@@ -113,15 +113,9 @@ class cmake
* and going up until it reaches the HomeDirectory.
*/
void SetHomeDirectory(const std::string& dir);
- const char* GetHomeDirectory() const
- {
- return this->cmHomeDirectory.c_str();
- }
+ const char* GetHomeDirectory() const;
void SetHomeOutputDirectory(const std::string& dir);
- const char* GetHomeOutputDirectory() const
- {
- return this->HomeOutputDirectory.c_str();
- }
+ const char* GetHomeOutputDirectory() const;
//@}
//@{
@@ -132,24 +126,10 @@ class cmake
* recursing up the tree starting at the StartDirectory and going up until
* it reaches the HomeDirectory.
*/
- void SetStartDirectory(const std::string& dir)
- {
- this->cmStartDirectory = dir;
- cmSystemTools::ConvertToUnixSlashes(this->cmStartDirectory);
- }
- const char* GetStartDirectory() const
- {
- return this->cmStartDirectory.c_str();
- }
- void SetStartOutputDirectory(const std::string& dir)
- {
- this->StartOutputDirectory = dir;
- cmSystemTools::ConvertToUnixSlashes(this->StartOutputDirectory);
- }
- const char* GetStartOutputDirectory() const
- {
- return this->StartOutputDirectory.c_str();
- }
+ void SetStartDirectory(const std::string& dir);
+ const char* GetStartDirectory() const;
+ void SetStartOutputDirectory(const std::string& dir);
+ const char* GetStartOutputDirectory() const;
//@}
/**
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0ee3ccb3b0a25264e8302a150eee297dd40affde
commit 0ee3ccb3b0a25264e8302a150eee297dd40affde
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Apr 12 19:32:48 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Apr 12 23:10:44 2015 +0200
cmake: Fix variable name bugs.
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 1d067a5..f182ad2 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -1112,9 +1112,9 @@ void cmake::SetHomeDirectory(const std::string& dir)
cmSystemTools::ConvertToUnixSlashes(this->cmHomeDirectory);
}
-void cmake::SetHomeOutputDirectory(const std::string& lib)
+void cmake::SetHomeOutputDirectory(const std::string& dir)
{
- this->HomeOutputDirectory = lib;
+ this->HomeOutputDirectory = dir;
cmSystemTools::ConvertToUnixSlashes(this->HomeOutputDirectory);
}
diff --git a/Source/cmake.h b/Source/cmake.h
index c436c77..26ee8fe 100644
--- a/Source/cmake.h
+++ b/Source/cmake.h
@@ -117,7 +117,7 @@ class cmake
{
return this->cmHomeDirectory.c_str();
}
- void SetHomeOutputDirectory(const std::string& lib);
+ void SetHomeOutputDirectory(const std::string& dir);
const char* GetHomeOutputDirectory() const
{
return this->HomeOutputDirectory.c_str();
@@ -141,9 +141,9 @@ class cmake
{
return this->cmStartDirectory.c_str();
}
- void SetStartOutputDirectory(const std::string& lib)
+ void SetStartOutputDirectory(const std::string& dir)
{
- this->StartOutputDirectory = lib;
+ this->StartOutputDirectory = dir;
cmSystemTools::ConvertToUnixSlashes(this->StartOutputDirectory);
}
const char* GetStartOutputDirectory() const
-----------------------------------------------------------------------
Summary of changes:
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list