diff options
| author | Brad King <brad.king@kitware.com> | 2011-03-31 17:22:54 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2011-03-31 17:22:54 (GMT) |
| commit | 0506e37499929e3c6797328f3dc9b9b46e89aef4 (patch) | |
| tree | 3fa6b5c3d65167cc7a47d3e2c1196c4ef004f126 /Source/cmake.h | |
| parent | 3c7c1f07a0f0ed208efff80769bf87724f1f9210 (diff) | |
| parent | a4335a621eabd74645dfdb6b0c731a6d354fcd30 (diff) | |
| download | CMake-0506e37499929e3c6797328f3dc9b9b46e89aef4.zip CMake-0506e37499929e3c6797328f3dc9b9b46e89aef4.tar.gz CMake-0506e37499929e3c6797328f3dc9b9b46e89aef4.tar.bz2 | |
Merge topic 'cleanup-unused-variable-check'
a4335a6 Fix unused cache warning after multiple configure iterations
a75ebe3 Refine unused cache variable warning
Diffstat (limited to 'Source/cmake.h')
| -rw-r--r-- | Source/cmake.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmake.h b/Source/cmake.h index 132a86d..fac86c1 100644 --- a/Source/cmake.h +++ b/Source/cmake.h @@ -368,8 +368,8 @@ class cmake void UnwatchUnusedCli(const char* var); void WatchUnusedCli(const char* var); - void RunCheckForUnusedVariables(const std::string& reason) const; protected: + void RunCheckForUnusedVariables(); void InitializeProperties(); int HandleDeleteCacheVariables(const char* var); cmPropertyMap Properties; @@ -467,7 +467,7 @@ private: bool WarnUnused; bool WarnUnusedCli; bool CheckSystemVars; - std::map<std::string, bool> UsedCliVariables; + std::map<cmStdString, bool> UsedCliVariables; std::string CMakeEditCommand; std::string CMakeCommand; std::string CXXEnvironment; |