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 86ad0abe63dadf14f565bf600fe0483e7cdb5540 (commit)
via ae9c78f37c2666943f5686ed4cf325efb2d3e75b (commit)
via 45073513a283ab318fc0a5cd9a63cb3999dcfec3 (commit)
via db8df7a62542203d0f85c4d5321ec873919e1a83 (commit)
via 129a73837a9fdec709dd8224490500d6840b3853 (commit)
via 7abe72ae66bc1ed60c7f843937a1de1b7e45d8e4 (commit)
via ef72976841a259e82ee93d90ff7f4b6389a923f7 (commit)
via 902e96a835b1050264eba52e4fac46dd3a23bc3f (commit)
from 22ba7f85f56861954b3a9cda1e55c5d7b77071cc (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=86ad0abe63dadf14f565bf600fe0483e7cdb5540
commit 86ad0abe63dadf14f565bf600fe0483e7cdb5540
Merge: 22ba7f8 ae9c78f
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Tue May 19 18:36:09 2015 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue May 19 18:36:09 2015 -0400
Merge topic 'clean-up-cmLocalGenerator' into next
ae9c78f3 Convert: Remove specification of default parameter.
45073513 cmGlobalGenerator: Use a variable to add some uniformity.
db8df7a6 cmLocalGenerator: Get cache value from cmState.
129a7383 cmLocalGenerator: Get enabled languages from cmState.
7abe72ae cmLocalGenerator: Implement IsRootMakefile in terms of cmState.
ef729768 cmLocalGenerator: Inline ReadListFile method.
902e96a8 cmLocalGenerator: Devirtualize method.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ae9c78f37c2666943f5686ed4cf325efb2d3e75b
commit ae9c78f37c2666943f5686ed4cf325efb2d3e75b
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Mon May 18 04:54:27 2015 +0200
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Tue May 19 23:51:47 2015 +0200
Convert: Remove specification of default parameter.
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 8deed1f..1a09e31 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1840,7 +1840,7 @@ void cmLocalGenerator::OutputLinkLibraries(std::string&
linkLibraries,
fdi != fwDirs.end(); ++fdi)
{
frameworkPath += fwSearchFlag;
- frameworkPath += this->Convert(*fdi, NONE, shellFormat, false);
+ frameworkPath += this->Convert(*fdi, NONE, shellFormat);
frameworkPath += " ";
}
}
@@ -1894,7 +1894,7 @@ void cmLocalGenerator::OutputLinkLibraries(std::string&
linkLibraries,
ri != runtimeDirs.end(); ++ri)
{
rpath += cli.GetRuntimeFlag();
- rpath += this->Convert(*ri, NONE, shellFormat, false);
+ rpath += this->Convert(*ri, NONE, shellFormat);
rpath += " ";
}
fout << rpath;
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx
b/Source/cmMakefileLibraryTargetGenerator.cxx
index c001622..450f573 100644
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@ -626,7 +626,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
install_name_dir =
this->LocalGenerator->Convert(install_name_dir,
cmLocalGenerator::NONE,
- cmLocalGenerator::SHELL, false);
+ cmLocalGenerator::SHELL);
vars.TargetInstallNameDir = install_name_dir.c_str();
}
}
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx
b/Source/cmNinjaNormalTargetGenerator.cxx
index 7f9c09f..3150ac9 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -527,8 +527,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
{
vars["INSTALLNAME_DIR"] = localGen.Convert(install_dir,
cmLocalGenerator::NONE,
- cmLocalGenerator::SHELL,
- false);
+ cmLocalGenerator::SHELL);
}
}
}
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index b2c603f..ebec923 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -456,8 +456,7 @@ bool cmake::FindPackage(const std::vector<std::string>&
args)
std::vector<std::string> includeDirs;
cmSystemTools::ExpandListArgument(includes, includeDirs);
- std::string includeFlags = lg->GetIncludeFlags(includeDirs, 0,
- language, false);
+ std::string includeFlags = lg->GetIncludeFlags(includeDirs, 0, language);
std::string definitions = mf->GetSafeDefinition("PACKAGE_DEFINITIONS");
printf("%s %s\n", includeFlags.c_str(), definitions.c_str());
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=45073513a283ab318fc0a5cd9a63cb3999dcfec3
commit 45073513a283ab318fc0a5cd9a63cb3999dcfec3
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Tue May 19 23:16:57 2015 +0200
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Tue May 19 23:51:47 2015 +0200
cmGlobalGenerator: Use a variable to add some uniformity.
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 1ca2c95..d92f359 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -2005,7 +2005,7 @@ void cmGlobalGenerator::FillProjectMap()
if (name != lg->GetMakefile()->GetProjectName())
{
name = lg->GetMakefile()->GetProjectName();
- this->ProjectMap[name].push_back(this->LocalGenerators[i]);
+ this->ProjectMap[name].push_back(lg);
}
lg = lg->GetParent();
}
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=db8df7a62542203d0f85c4d5321ec873919e1a83
commit db8df7a62542203d0f85c4d5321ec873919e1a83
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Tue May 19 23:16:07 2015 +0200
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Tue May 19 23:51:47 2015 +0200
cmLocalGenerator: Get cache value from cmState.
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 311339a..8deed1f 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -993,9 +993,9 @@ cmLocalGenerator::ExpandRuleVariable(std::string const&
variable,
}
if(variable == "CMAKE_COMMAND")
{
- const char* cmcommand =
- this->GetMakefile()->GetDefinition("CMAKE_COMMAND");
- return this->Convert(cmcommand, FULL, SHELL);
+ return this->Convert(
+ this->GetState()->GetInitializedCacheValue("CMAKE_COMMAND"),
+ FULL, SHELL);
}
std::vector<std::string> enabledLanguages =
this->GetState()->GetEnabledLanguages();
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=129a73837a9fdec709dd8224490500d6840b3853
commit 129a73837a9fdec709dd8224490500d6840b3853
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Tue May 19 23:14:18 2015 +0200
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Tue May 19 23:51:47 2015 +0200
cmLocalGenerator: Get enabled languages from cmState.
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 8dffd75..311339a 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -997,8 +997,8 @@ cmLocalGenerator::ExpandRuleVariable(std::string const&
variable,
this->GetMakefile()->GetDefinition("CMAKE_COMMAND");
return this->Convert(cmcommand, FULL, SHELL);
}
- std::vector<std::string> enabledLanguages;
- this->GlobalGenerator->GetEnabledLanguages(enabledLanguages);
+ std::vector<std::string> enabledLanguages =
+ this->GetState()->GetEnabledLanguages();
// loop over language specific replace variables
int pos = 0;
while(ruleReplaceVars[pos])
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7abe72ae66bc1ed60c7f843937a1de1b7e45d8e4
commit 7abe72ae66bc1ed60c7f843937a1de1b7e45d8e4
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Tue May 19 23:10:30 2015 +0200
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Tue May 19 23:51:47 2015 +0200
cmLocalGenerator: Implement IsRootMakefile in terms of cmState.
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 2804421..8dffd75 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -76,7 +76,7 @@ cmLocalGenerator::~cmLocalGenerator()
bool cmLocalGenerator::IsRootMakefile() const
{
- return !this->GetParent();
+ return !this->StateSnapshot.GetParent().IsValid();
}
//----------------------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ef72976841a259e82ee93d90ff7f4b6389a923f7
commit ef72976841a259e82ee93d90ff7f4b6389a923f7
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Tue May 19 23:09:46 2015 +0200
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Tue May 19 23:51:47 2015 +0200
cmLocalGenerator: Inline ReadListFile method.
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 0f18225..2804421 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -115,8 +115,10 @@ void cmLocalGenerator::Configure()
filesDir += cmake::GetCMakeFilesDirectory();
cmSystemTools::MakeDirectory(filesDir.c_str());
- // find & read the list file
- this->ReadInputFile();
+ std::string currentStart = this->StateSnapshot.GetCurrentSourceDirectory();
+ currentStart += "/CMakeLists.txt";
+ assert(cmSystemTools::FileExists(currentStart.c_str(), true));
+ this->Makefile->ProcessBuildsystemFile(currentStart.c_str());
// at the end of the ReadListFile handle any old style subdirs
// first get all the subdirectories
@@ -183,16 +185,6 @@ void cmLocalGenerator::ComputeObjectMaxPath()
this->ObjectMaxPathViolations.clear();
}
-//----------------------------------------------------------------------------
-void cmLocalGenerator::ReadInputFile()
-{
- // Look for the CMakeLists.txt file.
- std::string currentStart = this->StateSnapshot.GetCurrentSourceDirectory();
- currentStart += "/CMakeLists.txt";
- assert(cmSystemTools::FileExists(currentStart.c_str(), true));
- this->Makefile->ProcessBuildsystemFile(currentStart.c_str());
-}
-
void cmLocalGenerator::ConfigureFinalPass()
{
this->Makefile->ConfigureFinalPass();
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 14fa28e..3fca225 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -447,9 +447,6 @@ protected:
definition. Issues a warning. */
virtual bool CheckDefinition(std::string const& define) const;
- /** Read the input CMakeLists.txt file. */
- void ReadInputFile();
-
cmMakefile *Makefile;
cmState::Snapshot StateSnapshot;
cmGlobalGenerator *GlobalGenerator;
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=902e96a835b1050264eba52e4fac46dd3a23bc3f
commit 902e96a835b1050264eba52e4fac46dd3a23bc3f
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Tue May 19 09:47:18 2015 +0200
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Tue May 19 23:51:36 2015 +0200
cmLocalGenerator: Devirtualize method.
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 67ac4fd..14fa28e 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -395,7 +395,7 @@ public:
protected:
///! put all the libraries for a target on into the given stream
- virtual void OutputLinkLibraries(std::string& linkLibraries,
+ void OutputLinkLibraries(std::string& linkLibraries,
std::string& frameworkPath,
std::string& linkPath,
cmGeneratorTarget &,
-----------------------------------------------------------------------
Summary of changes:
Source/cmGlobalGenerator.cxx | 2 +-
Source/cmLocalGenerator.cxx | 32 ++++++++++-----------------
Source/cmLocalGenerator.h | 5 +----
Source/cmMakefileLibraryTargetGenerator.cxx | 2 +-
Source/cmNinjaNormalTargetGenerator.cxx | 3 +--
Source/cmake.cxx | 3 +--
6 files changed, 17 insertions(+), 30 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
