[Cmake-commits] CMake branch, next, updated. v3.2.1-1487-gbda8224
Stephen Kelly
steveire at gmail.com
Sun Apr 5 04:26:53 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 bda82241db4eb8d23661d3ce95de0b011d4b40d3 (commit)
via c37cf7fa9e0aa7f7c3a2b32457385a1caf37bc3c (commit)
via 64556e3dfa4161b33110daba606439f2c7971b15 (commit)
via 23bb5d225b772f7e18dab16375c7620c99d62814 (commit)
via 510562e3e7b9387bebe14060b147ec3022ee58a3 (commit)
via 629e94893668c69fccb6954b0fc807c54e9218dd (commit)
via d280bae98f009b56b9c14243981d5aba3e2f8747 (commit)
via 364c7ea187d67f702891b201970712806999ad07 (commit)
via 47acfe1d1e480bee109efa2de9253cf1a5457a8e (commit)
from 1382e8156cfe09a06a13451f9ae7879b135f3ede (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=bda82241db4eb8d23661d3ce95de0b011d4b40d3
commit bda82241db4eb8d23661d3ce95de0b011d4b40d3
Merge: 1382e81 c37cf7f
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Apr 5 04:26:51 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Apr 5 04:26:51 2015 -0400
Merge topic 'minor-cleanups' into next
c37cf7fa cmCacheManager: Remove unused method
64556e3d cmCacheManager: Remove unused overloads.
23bb5d22 cmCacheManager: Remove use of intermediate overload.
510562e3 cmGlobalGenerator: Don't fetch the cache manager in a loop.
629e9489 cmake: Clear member rather than explicit erase.
d280bae9 cmake: Be clear that there is no chaining after global properties.
364c7ea1 cmake: Remove unused method.
47acfe1d cmake: Remove unused member.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c37cf7fa9e0aa7f7c3a2b32457385a1caf37bc3c
commit c37cf7fa9e0aa7f7c3a2b32457385a1caf37bc3c
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Apr 4 20:42:28 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Apr 5 10:26:10 2015 +0200
cmCacheManager: Remove unused method
diff --git a/Source/cmCacheManager.cxx b/Source/cmCacheManager.cxx
index 002ccd1..fa7eff3 100644
--- a/Source/cmCacheManager.cxx
+++ b/Source/cmCacheManager.cxx
@@ -896,21 +896,3 @@ bool cmCacheManager::CacheIterator::PropertyExists(
{
return this->GetProperty(prop)? true:false;
}
-
-//----------------------------------------------------------------------------
-bool cmCacheManager::NeedCacheCompatibility(int major, int minor)
-{
- // Compatibility is not needed if the cache version is zero because
- // the cache was created or modified by the user.
- if(this->CacheMajorVersion == 0)
- {
- return false;
- }
-
- // Compatibility is needed if the cache version is equal to or lower
- // than the given version.
- cmIML_INT_uint64_t actual_compat =
- CMake_VERSION_ENCODE(this->CacheMajorVersion, this->CacheMinorVersion, 0);
- return (actual_compat &&
- actual_compat <= CMake_VERSION_ENCODE(major, minor, 0));
-}
diff --git a/Source/cmCacheManager.h b/Source/cmCacheManager.h
index 659d44a..f7f8776 100644
--- a/Source/cmCacheManager.h
+++ b/Source/cmCacheManager.h
@@ -144,7 +144,6 @@ public:
{ return this->CacheMajorVersion; }
unsigned int GetCacheMinorVersion() const
{ return this->CacheMinorVersion; }
- bool NeedCacheCompatibility(int major, int minor);
protected:
///! Add an entry into the cache
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index ec1d814..215ee16 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -184,11 +184,6 @@ unsigned int cmMakefile::GetCacheMinorVersion() const
return this->GetCacheManager()->GetCacheMinorVersion();
}
-bool cmMakefile::NeedCacheCompatibility(int major, int minor) const
-{
- return this->GetCacheManager()->NeedCacheCompatibility(major, minor);
-}
-
cmMakefile::~cmMakefile()
{
cmDeleteAll(this->InstallGenerators);
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 7c2085a..920b6b7 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -78,9 +78,6 @@ public:
bool VariableInitialized(const std::string& ) const;
/* return true if a variable has been used */
bool VariableUsed(const std::string& ) const;
- /** Return whether compatibility features needed for a version of
- the cache or lower should be enabled. */
- bool NeedCacheCompatibility(int major, int minor) const;
/**
* Construct an empty makefile.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=64556e3dfa4161b33110daba606439f2c7971b15
commit 64556e3dfa4161b33110daba606439f2c7971b15
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Apr 4 20:24:34 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Apr 5 10:26:10 2015 +0200
cmCacheManager: Remove unused overloads.
diff --git a/Source/cmCacheManager.cxx b/Source/cmCacheManager.cxx
index 30791ff..002ccd1 100644
--- a/Source/cmCacheManager.cxx
+++ b/Source/cmCacheManager.cxx
@@ -76,25 +76,12 @@ bool cmCacheManager::IsType(const char* s)
return false;
}
-bool cmCacheManager::LoadCache(cmMakefile* mf)
-{
- return this->LoadCache(mf->GetHomeOutputDirectory());
-}
-
-
bool cmCacheManager::LoadCache(const std::string& path)
{
std::set<std::string> emptySet;
return this->LoadCache(path, true, emptySet, emptySet);
}
-bool cmCacheManager::LoadCache(const std::string& path,
- bool internal)
-{
- std::set<std::string> emptySet;
- return this->LoadCache(path, internal, emptySet, emptySet);
-}
-
static bool ParseEntryWithoutType(const std::string& entry,
std::string& var,
std::string& value)
@@ -419,12 +406,6 @@ void cmCacheManager::WritePropertyEntries(std::ostream& os,
}
}
-bool cmCacheManager::SaveCache(cmMakefile* mf)
-{
- return this->SaveCache(mf->GetHomeOutputDirectory());
-}
-
-
bool cmCacheManager::SaveCache(const std::string& path)
{
std::string cacheFile = path;
diff --git a/Source/cmCacheManager.h b/Source/cmCacheManager.h
index d9a9112..659d44a 100644
--- a/Source/cmCacheManager.h
+++ b/Source/cmCacheManager.h
@@ -105,17 +105,12 @@ public:
static const char* TypeToString(CacheEntryType);
static bool IsType(const char*);
- ///! Load a cache for given makefile. Loads from ouput home.
- bool LoadCache(cmMakefile*);
///! Load a cache for given makefile. Loads from path/CMakeCache.txt.
bool LoadCache(const std::string& path);
- bool LoadCache(const std::string& path, bool internal);
bool LoadCache(const std::string& path, bool internal,
std::set<std::string>& excludes,
std::set<std::string>& includes);
- ///! Save cache for given makefile. Saves to ouput home CMakeCache.txt.
- bool SaveCache(cmMakefile*) ;
///! Save cache for given makefile. Saves to ouput path/CMakeCache.txt
bool SaveCache(const std::string& path) ;
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=23bb5d225b772f7e18dab16375c7620c99d62814
commit 23bb5d225b772f7e18dab16375c7620c99d62814
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Apr 4 20:24:11 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Apr 5 10:26:10 2015 +0200
cmCacheManager: Remove use of intermediate overload.
diff --git a/Source/cmCacheManager.cxx b/Source/cmCacheManager.cxx
index 0c77891..30791ff 100644
--- a/Source/cmCacheManager.cxx
+++ b/Source/cmCacheManager.cxx
@@ -84,7 +84,8 @@ bool cmCacheManager::LoadCache(cmMakefile* mf)
bool cmCacheManager::LoadCache(const std::string& path)
{
- return this->LoadCache(path,true);
+ std::set<std::string> emptySet;
+ return this->LoadCache(path, true, emptySet, emptySet);
}
bool cmCacheManager::LoadCache(const std::string& path,
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=510562e3e7b9387bebe14060b147ec3022ee58a3
commit 510562e3e7b9387bebe14060b147ec3022ee58a3
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Apr 4 20:36:06 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Apr 5 10:26:10 2015 +0200
cmGlobalGenerator: Don't fetch the cache manager in a loop.
It doesn't change from Makefile to Makefile.
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 8123c99..3c0a0e2 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1537,10 +1537,9 @@ void cmGlobalGenerator::CheckLocalGenerators()
std::map<std::string, std::string> notFoundMap;
// std::set<std::string> notFoundMap;
// after it is all done do a ConfigureFinalPass
- cmCacheManager* manager = 0;
+ cmCacheManager* manager = this->GetCMakeInstance()->GetCacheManager();
for (unsigned int i = 0; i < this->LocalGenerators.size(); ++i)
{
- manager = this->LocalGenerators[i]->GetMakefile()->GetCacheManager();
this->LocalGenerators[i]->ConfigureFinalPass();
cmTargets &targets =
this->LocalGenerators[i]->GetMakefile()->GetTargets();
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=629e94893668c69fccb6954b0fc807c54e9218dd
commit 629e94893668c69fccb6954b0fc807c54e9218dd
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Apr 5 01:58:15 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Apr 5 10:26:10 2015 +0200
cmake: Clear member rather than explicit erase.
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 3381447..5c52a1a 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -212,7 +212,7 @@ void cmake::CleanupCommandsAndMacros()
delete j->second;
}
}
- this->Commands.erase(this->Commands.begin(), this->Commands.end());
+ this->Commands.clear();
std::vector<cmCommand*>::iterator it;
for ( it = commands.begin(); it != commands.end();
++ it )
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d280bae98f009b56b9c14243981d5aba3e2f8747
commit d280bae98f009b56b9c14243981d5aba3e2f8747
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Apr 5 10:11:30 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Apr 5 10:26:09 2015 +0200
cmake: Be clear that there is no chaining after global properties.
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 3dc50ab..3381447 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -2273,8 +2273,6 @@ const char *cmake::GetProperty(const std::string& prop)
const char *cmake::GetProperty(const std::string& prop,
cmProperty::ScopeType scope)
{
- bool chain = false;
-
// watch for special properties
std::string output = "";
if ( prop == "CACHE_VARIABLES" )
@@ -2332,7 +2330,8 @@ const char *cmake::GetProperty(const std::string& prop,
return FOR_EACH_CXX_FEATURE(STRING_LIST_ELEMENT) + 1;
}
#undef STRING_LIST_ELEMENT
- return this->Properties.GetPropertyValue(prop, scope, chain);
+ bool dummy = false;
+ return this->Properties.GetPropertyValue(prop, scope, dummy);
}
bool cmake::GetPropertyAsBool(const std::string& prop)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=364c7ea187d67f702891b201970712806999ad07
commit 364c7ea187d67f702891b201970712806999ad07
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Apr 5 01:29:45 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Apr 5 10:26:09 2015 +0200
cmake: Remove unused method.
diff --git a/Source/cmake.h b/Source/cmake.h
index 79ccc33..c22b329 100644
--- a/Source/cmake.h
+++ b/Source/cmake.h
@@ -287,9 +287,6 @@ class cmake
cmProperty::ScopeType scope);
bool GetPropertyAsBool(const std::string& prop);
- // Get the properties
- cmPropertyMap &GetProperties() { return this->Properties; }
-
///! Get or create an cmInstalledFile instance and return a pointer to it
cmInstalledFile *GetOrCreateInstalledFile(
cmMakefile* mf, const std::string& name);
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=47acfe1d1e480bee109efa2de9253cf1a5457a8e
commit 47acfe1d1e480bee109efa2de9253cf1a5457a8e
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Apr 4 23:46:14 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Apr 5 10:10:00 2015 +0200
cmake: Remove unused member.
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 51df7f2..3dc50ab 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -188,7 +188,6 @@ void cmake::InitializeProperties()
{
this->Properties.clear();
this->Properties.SetCMakeInstance(this);
- this->AccessedProperties.clear();
this->PropertyDefinitions.clear();
// initialize properties
diff --git a/Source/cmake.h b/Source/cmake.h
index 60ffcd4..79ccc33 100644
--- a/Source/cmake.h
+++ b/Source/cmake.h
@@ -383,7 +383,6 @@ protected:
void InitializeProperties();
int HandleDeleteCacheVariables(const std::string& var);
cmPropertyMap Properties;
- std::set<std::pair<std::string,cmProperty::ScopeType> > AccessedProperties;
std::map<cmProperty::ScopeType, cmPropertyDefinitionMap>
PropertyDefinitions;
-----------------------------------------------------------------------
Summary of changes:
Source/cmCacheManager.cxx | 38 +-------------------------------------
Source/cmCacheManager.h | 6 ------
Source/cmGlobalGenerator.cxx | 3 +--
Source/cmMakefile.cxx | 5 -----
Source/cmMakefile.h | 3 ---
Source/cmake.cxx | 8 +++-----
Source/cmake.h | 4 ----
7 files changed, 5 insertions(+), 62 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list